Merge pull request #820 from fluxcd/internal-controllers

Move `controllers` to `internal/controllers`
fluxcd · Mar 29, 2023 · 64cd8c1 · 64cd8c1
2 parents 2f5d875 + 31a62ad
commit 64cd8c1
Show file tree

Hide file tree

Showing 63 changed files with 29 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,26 @@
-# Binaries for programs and plugins
+# Binaries for programs and plugins.
 *.exe
 *.exe~
 *.dll
 *.so
 *.dylib
 
-# Test binary, built with `go test -c`
+# Test binary, built with `go test -c`.
 *.test
 
-# Output of the go coverage tool, specifically when used with LiteIDE
+# Output of the go coverage tool.
 *.out
 
-# Dependency directories (remove the comment below to include it)
-# vendor/
+# Build tools downloaded at runtime.
 bin/
+
+# Release manifests generated at runtime.
 config/release/
 config/crd/bases/ocirepositories.yaml
 config/crd/bases/gitrepositories.yaml
 config/crd/bases/buckets.yaml
 
 build/
+
+# CRDs for fuzzing tests.
+internal/controllers/testdata/crd
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,6 @@ RUN go mod download
 
 # copy source code
 COPY main.go main.go
-COPY controllers/ controllers/
 COPY internal/ internal/
 
 # build

diff --git a/controllers/kustomization_acl_test.go → ...nal/controllers/kustomization_acl_test.go b/controllers/kustomization_acl_test.go → ...nal/controllers/kustomization_acl_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	apiacl "github.com/fluxcd/pkg/apis/acl"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/testserver"
@@ -32,6 +31,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_NoCrossNamespaceRefs(t *testing.T) {

diff --git a/controllers/kustomization_controller.go → ...l/controllers/kustomization_controller.go b/controllers/kustomization_controller.go → ...l/controllers/kustomization_controller.go
@@ -51,6 +51,7 @@ import (
 	eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/http/fetch"
+	generator "github.com/fluxcd/pkg/kustomize"
 	"github.com/fluxcd/pkg/runtime/acl"
 	runtimeClient "github.com/fluxcd/pkg/runtime/client"
 	"github.com/fluxcd/pkg/runtime/conditions"
@@ -64,7 +65,6 @@ import (
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/kustomize-controller/internal/decryptor"
 	"github.com/fluxcd/kustomize-controller/internal/inventory"
-	generator "github.com/fluxcd/pkg/kustomize"
 )
 
 // +kubebuilder:rbac:groups=kustomize.toolkit.fluxcd.io,resources=kustomizations,verbs=get;list;watch;create;update;patch;delete

diff --git a/controllers/kustomization_decryptor_test.go → ...ntrollers/kustomization_decryptor_test.go b/controllers/kustomization_decryptor_test.go → ...ntrollers/kustomization_decryptor_test.go
@@ -24,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/hashicorp/vault/api"
@@ -33,6 +32,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_Decryptor(t *testing.T) {

diff --git a/controllers/kustomization_dependson_test.go → ...ntrollers/kustomization_dependson_test.go b/controllers/kustomization_dependson_test.go → ...ntrollers/kustomization_dependson_test.go
diff --git a/controllers/kustomization_fetcher_test.go → ...controllers/kustomization_fetcher_test.go b/controllers/kustomization_fetcher_test.go → ...controllers/kustomization_fetcher_test.go
diff --git a/controllers/kustomization_force_test.go → ...l/controllers/kustomization_force_test.go b/controllers/kustomization_force_test.go → ...l/controllers/kustomization_force_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/testserver"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -32,6 +31,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_Force(t *testing.T) {

diff --git a/controllers/kustomization_fuzzer_test.go → .../controllers/kustomization_fuzzer_test.go b/controllers/kustomization_fuzzer_test.go → .../controllers/kustomization_fuzzer_test.go
@@ -60,6 +60,7 @@ import (
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
+
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 

diff --git a/...llers/kustomization_impersonation_test.go → ...llers/kustomization_impersonation_test.go b/...llers/kustomization_impersonation_test.go → ...llers/kustomization_impersonation_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/testserver"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -34,6 +33,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_Impersonation(t *testing.T) {

diff --git a/controllers/kustomization_indexers.go → ...nal/controllers/kustomization_indexers.go b/controllers/kustomization_indexers.go → ...nal/controllers/kustomization_indexers.go
@@ -23,9 +23,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/runtime/dependency"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func (r *KustomizationReconciler) requestsForRevisionChangeOf(indexKey string) func(obj client.Object) []reconcile.Request {

diff --git a/controllers/kustomization_inventory_test.go → ...ntrollers/kustomization_inventory_test.go b/controllers/kustomization_inventory_test.go → ...ntrollers/kustomization_inventory_test.go
diff --git a/controllers/kustomization_prune_test.go → ...l/controllers/kustomization_prune_test.go b/controllers/kustomization_prune_test.go → ...l/controllers/kustomization_prune_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/testserver"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -32,6 +31,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_Prune(t *testing.T) {

diff --git a/...rollers/kustomization_transformer_test.go → ...rollers/kustomization_transformer_test.go b/...rollers/kustomization_transformer_test.go → ...rollers/kustomization_transformer_test.go
diff --git a/controllers/kustomization_validation_test.go → ...trollers/kustomization_validation_test.go b/controllers/kustomization_validation_test.go → ...trollers/kustomization_validation_test.go
@@ -22,13 +22,14 @@ import (
 	"testing"
 	"time"
 
-	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 )
 
 func TestKustomizationReconciler_Validation(t *testing.T) {

diff --git a/controllers/kustomization_varsub_test.go → .../controllers/kustomization_varsub_test.go b/controllers/kustomization_varsub_test.go → .../controllers/kustomization_varsub_test.go
diff --git a/controllers/kustomization_wait_test.go → ...al/controllers/kustomization_wait_test.go b/controllers/kustomization_wait_test.go → ...al/controllers/kustomization_wait_test.go
diff --git a/controllers/source_predicate.go → internal/controllers/source_predicate.go b/controllers/source_predicate.go → internal/controllers/source_predicate.go
diff --git a/controllers/suite_test.go → internal/controllers/suite_test.go b/controllers/suite_test.go → internal/controllers/suite_test.go
@@ -188,7 +188,7 @@ func TestMain(m *testing.M) {
 	}, func() error {
 		code = m.Run()
 		return nil
-	}, filepath.Join("..", "config", "crd", "bases"))
+	}, filepath.Join("..", "..", "config", "crd", "bases"))
 
 	os.Exit(code)
 }

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 → ...lers/testdata/file-transformer/patch.yaml b/...lers/testdata/file-transformer/patch.yaml → ...lers/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 → ...lers/testdata/file-transformer/quota.yaml b/...lers/testdata/file-transformer/quota.yaml → ...lers/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 → ...rs/testdata/invalid/plain/deployment.yaml b/...rs/testdata/invalid/plain/deployment.yaml → ...rs/testdata/invalid/plain/deployment.yaml
diff --git a/controllers/testdata/patch/deployment.yaml → ...ontrollers/testdata/patch/deployment.yaml b/controllers/testdata/patch/deployment.yaml → ...ontrollers/testdata/patch/deployment.yaml
diff --git a/controllers/testdata/sops/.sops.yaml → ...rnal/controllers/testdata/sops/.sops.yaml b/controllers/testdata/sops/.sops.yaml → ...rnal/controllers/testdata/sops/.sops.yaml
diff --git a/controllers/testdata/sops/age.txt → internal/controllers/testdata/sops/age.txt b/controllers/testdata/sops/age.txt → internal/controllers/testdata/sops/age.txt
diff --git a/controllers/testdata/sops/day.txt → internal/controllers/testdata/sops/day.txt b/controllers/testdata/sops/day.txt → internal/controllers/testdata/sops/day.txt
diff --git a/controllers/testdata/sops/day.txt.encrypted → ...ntrollers/testdata/sops/day.txt.encrypted b/controllers/testdata/sops/day.txt.encrypted → ...ntrollers/testdata/sops/day.txt.encrypted
diff --git a/...rs/testdata/sops/month/kustomization.yaml → ...rs/testdata/sops/month/kustomization.yaml b/...rs/testdata/sops/month/kustomization.yaml → ...rs/testdata/sops/month/kustomization.yaml
diff --git a/controllers/testdata/sops/month/month.yaml → ...ontrollers/testdata/sops/month/month.yaml b/controllers/testdata/sops/month/month.yaml → ...ontrollers/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 → .../controllers/testdata/sops/month/year.env b/controllers/testdata/sops/month/year.env → .../controllers/testdata/sops/month/year.env
diff --git a/controllers/testdata/sops/pgp.asc → internal/controllers/testdata/sops/pgp.asc b/controllers/testdata/sops/pgp.asc → internal/controllers/testdata/sops/pgp.asc
diff --git a/controllers/testdata/sops/secret.age.yaml → ...controllers/testdata/sops/secret.age.yaml b/controllers/testdata/sops/secret.age.yaml → ...controllers/testdata/sops/secret.age.yaml
diff --git a/controllers/testdata/sops/secret.day.yaml → ...controllers/testdata/sops/secret.day.yaml b/controllers/testdata/sops/secret.day.yaml → ...controllers/testdata/sops/secret.day.yaml
diff --git a/controllers/testdata/sops/secret.vault.yaml → ...ntrollers/testdata/sops/secret.vault.yaml b/controllers/testdata/sops/secret.vault.yaml → ...ntrollers/testdata/sops/secret.vault.yaml
diff --git a/controllers/testdata/sops/secret.yaml → ...nal/controllers/testdata/sops/secret.yaml b/controllers/testdata/sops/secret.yaml → ...nal/controllers/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 → ...s/testdata/test-dotenv/overlays/year1.env b/...s/testdata/test-dotenv/overlays/year1.env → ...s/testdata/test-dotenv/overlays/year1.env
diff --git a/...ers/testdata/transformers/deployment.yaml → ...ers/testdata/transformers/deployment.yaml b/...ers/testdata/transformers/deployment.yaml → ...ers/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/controllers/testdata/transformers/patch.yaml → ...trollers/testdata/transformers/patch.yaml b/controllers/testdata/transformers/patch.yaml → ...trollers/testdata/transformers/patch.yaml
diff --git a/controllers/testdata/transformers/quota.yaml → ...trollers/testdata/transformers/quota.yaml b/controllers/testdata/transformers/quota.yaml → ...trollers/testdata/transformers/quota.yaml
diff --git a/controllers/utils.go → internal/controllers/utils.go b/controllers/utils.go → internal/controllers/utils.go
diff --git a/main.go b/main.go
@@ -45,7 +45,7 @@ import (
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
-	"github.com/fluxcd/kustomize-controller/controllers"
+	"github.com/fluxcd/kustomize-controller/internal/controllers"
 	"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 controllers/testdata/crd
-cp config/crd/bases/*.yaml controllers/testdata/crd
+mkdir -p internal/controllers/testdata/crd
+cp config/crd/bases/*.yaml internal/controllers/testdata/crd
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ import ( @@
     	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
     	fuzz "github.com/AdaLogics/go-fuzz-headers"
     	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
     )
@@ Expand Down @@