Rename controllers to controller

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
fluxcd · May 25, 2023 · 9720e24 · 9720e24
1 parent 33592d2
commit 9720e24
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ notes
 
 # Thes are downloaded in the Makefile
 cache/*
-internal/controllers/testdata/crds/*
+internal/controller/testdata/crds/*
 
 # Binaries for programs and plugins
 *.exe
@@ -33,4 +33,4 @@ testbin
 build/
 
 # CRDs for fuzzing tests.
-internal/controllers/testdata/crd
+internal/controller/testdata/crd
diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ ifeq ($(shell uname -s),Darwin)
 ENVTEST_ARCH=amd64
 endif
 
-TEST_CRDS := internal/controllers/testdata/crds
+TEST_CRDS := internal/controller/testdata/crds
 
 # Log level for `make run`
 LOG_LEVEL ?= info

diff --git a/docs/spec/v1beta1/imageupdateautomations.md b/docs/spec/v1beta1/imageupdateautomations.md
@@ -264,7 +264,7 @@ The message template is a [Go text template][go-text-template]. The data availab
 have this structure (not reproduced verbatim):
 
 ```go
-// controllers/imageupdateautomation_controller.go
+// internal/controller/imageupdateautomation_controller.go
 
 // TemplateData is the type of the value given to the commit message
 // template.

diff --git a/...al/controllers/controllers_fuzzer_test.go → ...nal/controller/controllers_fuzzer_test.go b/...al/controllers/controllers_fuzzer_test.go → ...nal/controller/controllers_fuzzer_test.go
diff --git a/...llers/imageupdateautomation_controller.go → ...oller/imageupdateautomation_controller.go b/...llers/imageupdateautomation_controller.go → ...oller/imageupdateautomation_controller.go
diff --git a/.../imageupdateautomation_controller_test.go → .../imageupdateautomation_controller_test.go b/.../imageupdateautomation_controller_test.go → .../imageupdateautomation_controller_test.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/...s/testdata/appconfig-expected/deploy.yaml → ...r/testdata/appconfig-expected/deploy.yaml b/...s/testdata/appconfig-expected/deploy.yaml → ...r/testdata/appconfig-expected/deploy.yaml
diff --git a/.../testdata/appconfig-expected2/deploy.yaml → .../testdata/appconfig-expected2/deploy.yaml b/.../testdata/appconfig-expected2/deploy.yaml → .../testdata/appconfig-expected2/deploy.yaml
diff --git a/...ta/appconfig-setters-expected/deploy.yaml → ...ta/appconfig-setters-expected/deploy.yaml b/...ta/appconfig-setters-expected/deploy.yaml → ...ta/appconfig-setters-expected/deploy.yaml
diff --git a/...ontrollers/testdata/appconfig/deploy.yaml → ...controller/testdata/appconfig/deploy.yaml b/...ontrollers/testdata/appconfig/deploy.yaml → ...controller/testdata/appconfig/deploy.yaml
diff --git a/.../controllers/testdata/brokenlink/bar.yaml → ...l/controller/testdata/brokenlink/bar.yaml b/.../controllers/testdata/brokenlink/bar.yaml → ...l/controller/testdata/brokenlink/bar.yaml
diff --git a/...ollers/testdata/pathconfig/no/deploy.yaml → ...roller/testdata/pathconfig/no/deploy.yaml b/...ollers/testdata/pathconfig/no/deploy.yaml → ...roller/testdata/pathconfig/no/deploy.yaml
diff --git a/...llers/testdata/pathconfig/yes/deploy.yaml → ...oller/testdata/pathconfig/yes/deploy.yaml b/...llers/testdata/pathconfig/yes/deploy.yaml → ...oller/testdata/pathconfig/yes/deploy.yaml
diff --git a/internal/controllers/update_test.go → internal/controller/update_test.go b/internal/controllers/update_test.go → internal/controller/update_test.go
diff --git a/main.go b/main.go
@@ -49,7 +49,7 @@ import (
 	"github.com/fluxcd/pkg/git"
 
 	// +kubebuilder:scaffold:imports
-	"github.com/fluxcd/image-automation-controller/internal/controllers"
+	"github.com/fluxcd/image-automation-controller/internal/controller"
 )
 
 const (

diff --git a/tests/fuzz/oss_fuzz_prebuild.sh b/tests/fuzz/oss_fuzz_prebuild.sh
@@ -21,8 +21,8 @@ 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
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
@@ -32,10 +32,10 @@ SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2
 # Pulls image-reflector-controller/api's version set in go.mod.
 REFLECTOR_VER=$(go list -m github.com/fluxcd/image-reflector-controller/api | awk '{print $2}')
 
-if [ -d "../../internal/controllers/testdata/crds" ]; then
-    cp ../../internal/controllers/testdata/crds/*.yaml testdata/crds
+if [ -d "../../internal/controller/testdata/crds" ]; then
+    cp ../../internal/controller/testdata/crds/*.yaml testdata/crds
 else
     # Fetch the CRDs if not present since we need them when running fuzz tests on CI.
-    curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml -o internal/controllers/testdata/crd/gitrepositories.yaml
-    curl -s --fail https://raw.githubusercontent.com/fluxcd/image-reflector-controller/${REFLECTOR_VER}/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml -o internal/controllers/testdata/crd/imagepolicies.yaml
+    curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml -o internal/controller/testdata/crd/gitrepositories.yaml
+    curl -s --fail https://raw.githubusercontent.com/fluxcd/image-reflector-controller/${REFLECTOR_VER}/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml -o internal/controller/testdata/crd/imagepolicies.yaml
 fi