fluxcd · stefanprodan · May 24, 2023 · May 24, 2023 · May 24, 2023
diff --git a/Dockerfile b/Dockerfile
@@ -32,9 +32,10 @@ RUN xx-go build -trimpath -a -o kustomize-controller main.go
 
 FROM alpine:3.18
 
-# Uses GnuPG from edge to patch CVE-2022-3515.
-RUN apk add --no-cache ca-certificates tini git openssh-client && \
-	apk add --no-cache gnupg --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main
+ARG TARGETPLATFORM
+
+RUN apk --no-cache add ca-certificates tini git openssh-client gnupg \
+  && update-ca-certificates
 
 COPY --from=builder /workspace/kustomize-controller /usr/local/bin/
 

diff --git a/...nal/controllers/kustomization_acl_test.go → ...rnal/controller/kustomization_acl_test.go b/...nal/controllers/kustomization_acl_test.go → ...rnal/controller/kustomization_acl_test.go
diff --git a/...l/controllers/kustomization_controller.go → ...al/controller/kustomization_controller.go b/...l/controllers/kustomization_controller.go → ...al/controller/kustomization_controller.go
diff --git a/...ntrollers/kustomization_decryptor_test.go → ...ontroller/kustomization_decryptor_test.go b/...ntrollers/kustomization_decryptor_test.go → ...ontroller/kustomization_decryptor_test.go
diff --git a/...ntrollers/kustomization_dependson_test.go → ...ontroller/kustomization_dependson_test.go b/...ntrollers/kustomization_dependson_test.go → ...ontroller/kustomization_dependson_test.go
diff --git a/...controllers/kustomization_fetcher_test.go → .../controller/kustomization_fetcher_test.go b/...controllers/kustomization_fetcher_test.go → .../controller/kustomization_fetcher_test.go
diff --git a/...l/controllers/kustomization_force_test.go → ...al/controller/kustomization_force_test.go b/...l/controllers/kustomization_force_test.go → ...al/controller/kustomization_force_test.go
diff --git a/.../controllers/kustomization_fuzzer_test.go → ...l/controller/kustomization_fuzzer_test.go b/.../controllers/kustomization_fuzzer_test.go → ...l/controller/kustomization_fuzzer_test.go
diff --git a/...llers/kustomization_impersonation_test.go → ...oller/kustomization_impersonation_test.go b/...llers/kustomization_impersonation_test.go → ...oller/kustomization_impersonation_test.go
diff --git a/...nal/controllers/kustomization_indexers.go → ...rnal/controller/kustomization_indexers.go b/...nal/controllers/kustomization_indexers.go → ...rnal/controller/kustomization_indexers.go
diff --git a/...ntrollers/kustomization_inventory_test.go → ...ontroller/kustomization_inventory_test.go b/...ntrollers/kustomization_inventory_test.go → ...ontroller/kustomization_inventory_test.go
diff --git a/...l/controllers/kustomization_prune_test.go → ...al/controller/kustomization_prune_test.go b/...l/controllers/kustomization_prune_test.go → ...al/controller/kustomization_prune_test.go
diff --git a/...rollers/kustomization_transformer_test.go → ...troller/kustomization_transformer_test.go b/...rollers/kustomization_transformer_test.go → ...troller/kustomization_transformer_test.go
diff --git a/...trollers/kustomization_validation_test.go → ...ntroller/kustomization_validation_test.go b/...trollers/kustomization_validation_test.go → ...ntroller/kustomization_validation_test.go
diff --git a/.../controllers/kustomization_varsub_test.go → ...l/controller/kustomization_varsub_test.go b/.../controllers/kustomization_varsub_test.go → ...l/controller/kustomization_varsub_test.go
diff --git a/...al/controllers/kustomization_wait_test.go → ...nal/controller/kustomization_wait_test.go b/...al/controllers/kustomization_wait_test.go → ...nal/controller/kustomization_wait_test.go
diff --git a/internal/controllers/source_predicate.go → internal/controller/source_predicate.go b/internal/controllers/source_predicate.go → internal/controller/source_predicate.go
diff --git a/internal/controllers/suite_test.go → internal/controller/suite_test.go b/internal/controllers/suite_test.go → internal/controller/suite_test.go
diff --git a/...e-transformer/annotation-transformer.yaml → ...e-transformer/annotation-transformer.yaml b/...e-transformer/annotation-transformer.yaml → ...e-transformer/annotation-transformer.yaml
diff --git a/...file-transformer/configmap-generator.yaml → ...file-transformer/configmap-generator.yaml b/...file-transformer/configmap-generator.yaml → ...file-transformer/configmap-generator.yaml
diff --git a/...testdata/file-transformer/deployment.yaml → ...testdata/file-transformer/deployment.yaml b/...testdata/file-transformer/deployment.yaml → ...testdata/file-transformer/deployment.yaml
diff --git a/...ile-transformer/imagetag-transformer.yaml → ...ile-transformer/imagetag-transformer.yaml b/...ile-transformer/imagetag-transformer.yaml → ...ile-transformer/imagetag-transformer.yaml
diff --git a/...tdata/file-transformer/kustomization.yaml → ...tdata/file-transformer/kustomization.yaml b/...tdata/file-transformer/kustomization.yaml → ...tdata/file-transformer/kustomization.yaml
diff --git a/...a/file-transformer/label-transformer.yaml → ...a/file-transformer/label-transformer.yaml b/...a/file-transformer/label-transformer.yaml → ...a/file-transformer/label-transformer.yaml
diff --git a/...le-transformer/namespace-transformer.yaml → ...le-transformer/namespace-transformer.yaml b/...le-transformer/namespace-transformer.yaml → ...le-transformer/namespace-transformer.yaml
diff --git a/...a/file-transformer/patch-transformer.yaml → ...a/file-transformer/patch-transformer.yaml b/...a/file-transformer/patch-transformer.yaml → ...a/file-transformer/patch-transformer.yaml
diff --git a/...lers/testdata/file-transformer/patch.yaml → ...ller/testdata/file-transformer/patch.yaml b/...lers/testdata/file-transformer/patch.yaml → ...ller/testdata/file-transformer/patch.yaml
diff --git a/...rmer/patchStrategicMerge-transformer.yaml → ...rmer/patchStrategicMerge-transformer.yaml b/...rmer/patchStrategicMerge-transformer.yaml → ...rmer/patchStrategicMerge-transformer.yaml
diff --git a/...ransformer/patchjson6902-transformer.yaml → ...ransformer/patchjson6902-transformer.yaml b/...ransformer/patchjson6902-transformer.yaml → ...ransformer/patchjson6902-transformer.yaml
diff --git a/...transformer/prefixsuffix-transformer.yaml → ...transformer/prefixsuffix-transformer.yaml b/...transformer/prefixsuffix-transformer.yaml → ...transformer/prefixsuffix-transformer.yaml
diff --git a/...lers/testdata/file-transformer/quota.yaml → ...ller/testdata/file-transformer/quota.yaml b/...lers/testdata/file-transformer/quota.yaml → ...ller/testdata/file-transformer/quota.yaml
diff --git a/...-transformer/replacement-transformer.yaml → ...-transformer/replacement-transformer.yaml b/...-transformer/replacement-transformer.yaml → ...-transformer/replacement-transformer.yaml
diff --git a/...ile-transformer/replicas-transformer.yaml → ...ile-transformer/replicas-transformer.yaml b/...ile-transformer/replicas-transformer.yaml → ...ile-transformer/replicas-transformer.yaml
diff --git a/...ta/file-transformer/secret-generator.yaml → ...ta/file-transformer/secret-generator.yaml b/...ta/file-transformer/secret-generator.yaml → ...ta/file-transformer/secret-generator.yaml
diff --git a/.../testdata/invalid/overlay/deployment.yaml → .../testdata/invalid/overlay/deployment.yaml b/.../testdata/invalid/overlay/deployment.yaml → .../testdata/invalid/overlay/deployment.yaml
diff --git a/...stdata/invalid/overlay/kustomization.yaml → ...stdata/invalid/overlay/kustomization.yaml b/...stdata/invalid/overlay/kustomization.yaml → ...stdata/invalid/overlay/kustomization.yaml
diff --git a/...rs/testdata/invalid/plain/deployment.yaml → ...er/testdata/invalid/plain/deployment.yaml b/...rs/testdata/invalid/plain/deployment.yaml → ...er/testdata/invalid/plain/deployment.yaml
diff --git a/...ontrollers/testdata/patch/deployment.yaml → ...controller/testdata/patch/deployment.yaml b/...ontrollers/testdata/patch/deployment.yaml → ...controller/testdata/patch/deployment.yaml
diff --git a/...rnal/controllers/testdata/sops/.sops.yaml → internal/controller/testdata/sops/.sops.yaml b/...rnal/controllers/testdata/sops/.sops.yaml → internal/controller/testdata/sops/.sops.yaml
diff --git a/internal/controllers/testdata/sops/age.txt → internal/controller/testdata/sops/age.txt b/internal/controllers/testdata/sops/age.txt → internal/controller/testdata/sops/age.txt
diff --git a/internal/controllers/testdata/sops/day.txt → internal/controller/testdata/sops/day.txt b/internal/controllers/testdata/sops/day.txt → internal/controller/testdata/sops/day.txt
diff --git a/...ntrollers/testdata/sops/day.txt.encrypted → ...ontroller/testdata/sops/day.txt.encrypted b/...ntrollers/testdata/sops/day.txt.encrypted → ...ontroller/testdata/sops/day.txt.encrypted
diff --git a/...rs/testdata/sops/month/kustomization.yaml → ...er/testdata/sops/month/kustomization.yaml b/...rs/testdata/sops/month/kustomization.yaml → ...er/testdata/sops/month/kustomization.yaml
diff --git a/...ontrollers/testdata/sops/month/month.yaml → ...controller/testdata/sops/month/month.yaml b/...ontrollers/testdata/sops/month/month.yaml → ...controller/testdata/sops/month/month.yaml
diff --git a/.../testdata/sops/month/unencrypted-year.env → .../testdata/sops/month/unencrypted-year.env b/.../testdata/sops/month/unencrypted-year.env → .../testdata/sops/month/unencrypted-year.env
diff --git a/.../controllers/testdata/sops/month/year.env → ...l/controller/testdata/sops/month/year.env b/.../controllers/testdata/sops/month/year.env → ...l/controller/testdata/sops/month/year.env
diff --git a/internal/controllers/testdata/sops/pgp.asc → internal/controller/testdata/sops/pgp.asc b/internal/controllers/testdata/sops/pgp.asc → internal/controller/testdata/sops/pgp.asc
diff --git a/...controllers/testdata/sops/secret.age.yaml → .../controller/testdata/sops/secret.age.yaml b/...controllers/testdata/sops/secret.age.yaml → .../controller/testdata/sops/secret.age.yaml
diff --git a/...controllers/testdata/sops/secret.day.yaml → .../controller/testdata/sops/secret.day.yaml b/...controllers/testdata/sops/secret.day.yaml → .../controller/testdata/sops/secret.day.yaml
diff --git a/...ntrollers/testdata/sops/secret.vault.yaml → ...ontroller/testdata/sops/secret.vault.yaml b/...ntrollers/testdata/sops/secret.vault.yaml → ...ontroller/testdata/sops/secret.vault.yaml
diff --git a/...nal/controllers/testdata/sops/secret.yaml → ...rnal/controller/testdata/sops/secret.yaml b/...nal/controllers/testdata/sops/secret.yaml → ...rnal/controller/testdata/sops/secret.yaml
diff --git a/...data/test-dotenv/bases/kustomization.yaml → ...data/test-dotenv/bases/kustomization.yaml b/...data/test-dotenv/bases/kustomization.yaml → ...data/test-dotenv/bases/kustomization.yaml
diff --git a/...tdata/test-dotenv/bases/secrets/year2.txt → ...tdata/test-dotenv/bases/secrets/year2.txt b/...tdata/test-dotenv/bases/secrets/year2.txt → ...tdata/test-dotenv/bases/secrets/year2.txt
diff --git a/...a/test-dotenv/overlays/kustomization.yaml → ...a/test-dotenv/overlays/kustomization.yaml b/...a/test-dotenv/overlays/kustomization.yaml → ...a/test-dotenv/overlays/kustomization.yaml
diff --git a/...s/testdata/test-dotenv/overlays/year1.env → ...r/testdata/test-dotenv/overlays/year1.env b/...s/testdata/test-dotenv/overlays/year1.env → ...r/testdata/test-dotenv/overlays/year1.env
diff --git a/...ers/testdata/transformers/deployment.yaml → ...ler/testdata/transformers/deployment.yaml b/...ers/testdata/transformers/deployment.yaml → ...ler/testdata/transformers/deployment.yaml
diff --git a/.../testdata/transformers/kustomization.yaml → .../testdata/transformers/kustomization.yaml b/.../testdata/transformers/kustomization.yaml → .../testdata/transformers/kustomization.yaml
diff --git a/...trollers/testdata/transformers/patch.yaml → ...ntroller/testdata/transformers/patch.yaml b/...trollers/testdata/transformers/patch.yaml → ...ntroller/testdata/transformers/patch.yaml
diff --git a/...trollers/testdata/transformers/quota.yaml → ...ntroller/testdata/transformers/quota.yaml b/...trollers/testdata/transformers/quota.yaml → ...ntroller/testdata/transformers/quota.yaml
diff --git a/internal/controllers/utils.go → internal/controller/utils.go b/internal/controllers/utils.go → internal/controller/utils.go
diff --git a/main.go b/main.go
@@ -49,7 +49,7 @@ import (
 	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
-	"github.com/fluxcd/kustomize-controller/internal/controllers"
+	"github.com/fluxcd/kustomize-controller/internal/controller"
 	"github.com/fluxcd/kustomize-controller/internal/features"
 	"github.com/fluxcd/kustomize-controller/internal/statusreaders"
 	// +kubebuilder:scaffold:imports

diff --git a/tests/fuzz/oss_fuzz_prebuild.sh b/tests/fuzz/oss_fuzz_prebuild.sh
@@ -21,5 +21,5 @@ set -euxo pipefail
 
 # Some tests requires embedded resources. Embedding does not allow
 # for traversing into ascending dirs, therefore we copy those contents here:
-mkdir -p internal/controllers/testdata/crd
-cp config/crd/bases/*.yaml internal/controllers/testdata/crd
+mkdir -p internal/controller/testdata/crd
+cp config/crd/bases/*.yaml internal/controller/testdata/crd