Merge pull request #473 from redhatrises/migrate_controllers

feat: migrate controllers to new folder to match golang project standards
CrowdStrike · Jan 11, 2024 · 0cf59a4 · 0cf59a4
2 parents 00244ed + 178eea3
commit 0cf59a4
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,6 @@ RUN go mod download
 COPY cmd/main.go cmd/main.go
 COPY version/ version/
 COPY api/ api/
-COPY controllers/ controllers/
 COPY internal/controller/ internal/controller/
 COPY pkg/ pkg/
 

diff --git a/cmd/main.go b/cmd/main.go
@@ -35,9 +35,9 @@ import (
 	schedulingv1 "k8s.io/api/scheduling/v1"
 
 	falconv1alpha1 "github.com/crowdstrike/falcon-operator/api/falcon/v1alpha1"
-	admissioncontroller "github.com/crowdstrike/falcon-operator/controllers/admission"
-	containercontroller "github.com/crowdstrike/falcon-operator/controllers/falcon_container"
-	nodecontroller "github.com/crowdstrike/falcon-operator/controllers/falcon_node"
+	admissioncontroller "github.com/crowdstrike/falcon-operator/internal/controller/admission"
+	containercontroller "github.com/crowdstrike/falcon-operator/internal/controller/falcon_container"
+	nodecontroller "github.com/crowdstrike/falcon-operator/internal/controller/falcon_node"
 	"github.com/crowdstrike/falcon-operator/pkg/common"
 	"github.com/crowdstrike/falcon-operator/version"
 	// +kubebuilder:scaffold:imports

diff --git a/controllers/admission/configmap.go → internal/controller/admission/configmap.go b/controllers/admission/configmap.go → internal/controller/admission/configmap.go
diff --git a/...s/admission/falconadmission_controller.go → ...r/admission/falconadmission_controller.go b/...s/admission/falconadmission_controller.go → ...r/admission/falconadmission_controller.go
diff --git a/...ission/falconadmission_controller_test.go → ...ission/falconadmission_controller_test.go b/...ission/falconadmission_controller_test.go → ...ission/falconadmission_controller_test.go
diff --git a/controllers/admission/image_push.go → internal/controller/admission/image_push.go b/controllers/admission/image_push.go → internal/controller/admission/image_push.go
diff --git a/controllers/admission/rbac.go → internal/controller/admission/rbac.go b/controllers/admission/rbac.go → internal/controller/admission/rbac.go
diff --git a/controllers/admission/suite_test.go → internal/controller/admission/suite_test.go b/controllers/admission/suite_test.go → internal/controller/admission/suite_test.go
@@ -36,7 +36,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
 		ErrorIfCRDPathMissing: true,
 	}
 

diff --git a/controllers/falcon_container/configmap.go → .../controller/falcon_container/configmap.go b/controllers/falcon_container/configmap.go → .../controller/falcon_container/configmap.go
diff --git a/...n_container/falconcontainer_controller.go → ...n_container/falconcontainer_controller.go b/...n_container/falconcontainer_controller.go → ...n_container/falconcontainer_controller.go
diff --git a/...tainer/falconcontainer_controller_test.go → ...tainer/falconcontainer_controller_test.go b/...tainer/falconcontainer_controller_test.go → ...tainer/falconcontainer_controller_test.go
diff --git a/controllers/falcon_container/image_push.go → ...controller/falcon_container/image_push.go b/controllers/falcon_container/image_push.go → ...controller/falcon_container/image_push.go
diff --git a/controllers/falcon_container/image_stream.go → ...ntroller/falcon_container/image_stream.go b/controllers/falcon_container/image_stream.go → ...ntroller/falcon_container/image_stream.go
diff --git a/controllers/falcon_container/injector.go → ...l/controller/falcon_container/injector.go b/controllers/falcon_container/injector.go → ...l/controller/falcon_container/injector.go
diff --git a/controllers/falcon_container/k8s_utils.go → .../controller/falcon_container/k8s_utils.go b/controllers/falcon_container/k8s_utils.go → .../controller/falcon_container/k8s_utils.go
diff --git a/controllers/falcon_container/ns.go → internal/controller/falcon_container/ns.go b/controllers/falcon_container/ns.go → internal/controller/falcon_container/ns.go
diff --git a/controllers/falcon_container/rbac.go → internal/controller/falcon_container/rbac.go b/controllers/falcon_container/rbac.go → internal/controller/falcon_container/rbac.go
diff --git a/controllers/falcon_container/registry.go → ...l/controller/falcon_container/registry.go b/controllers/falcon_container/registry.go → ...l/controller/falcon_container/registry.go
diff --git a/controllers/falcon_container/service.go → ...al/controller/falcon_container/service.go b/controllers/falcon_container/service.go → ...al/controller/falcon_container/service.go
diff --git a/controllers/falcon_container/suite_test.go → ...controller/falcon_container/suite_test.go b/controllers/falcon_container/suite_test.go → ...controller/falcon_container/suite_test.go
@@ -39,7 +39,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
 		ErrorIfCRDPathMissing: true,
 	}
 

diff --git a/controllers/falcon_container/webhook.go → ...al/controller/falcon_container/webhook.go b/controllers/falcon_container/webhook.go → ...al/controller/falcon_container/webhook.go
diff --git a/...alcon_node/falconnodesensor_controller.go → ...alcon_node/falconnodesensor_controller.go b/...alcon_node/falconnodesensor_controller.go → ...alcon_node/falconnodesensor_controller.go
diff --git a/..._node/falconnodesensor_controller_test.go → ..._node/falconnodesensor_controller_test.go b/..._node/falconnodesensor_controller_test.go → ..._node/falconnodesensor_controller_test.go
diff --git a/controllers/falcon_node/suite_test.go → ...rnal/controller/falcon_node/suite_test.go b/controllers/falcon_node/suite_test.go → ...rnal/controller/falcon_node/suite_test.go
@@ -40,7 +40,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
 		ErrorIfCRDPathMissing: true,
 	}