Move controllers to internal/controllers (#519)

Rename NodeModulesConfigReconciler to NMCReconciler. Use private interfaces for the NMCReconciler for consistency. Upstream-Commit: 7e339cb
rh-ecosystem-edge · Aug 25, 2023 · 68c6aae · 68c6aae
1 parent 2433383
commit 68c6aae
Show file tree

Hide file tree

Showing 33 changed files with 107 additions and 103 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,6 @@ COPY vendor vendor
 COPY api api
 COPY api-hub api-hub
 COPY cmd cmd
-COPY controllers controllers
 COPY docs.mk docs.mk
 COPY internal internal
 

diff --git a/Makefile b/Makefile
@@ -106,14 +106,14 @@ help: ## Display this help.
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=config/crd/bases
 	$(CONTROLLER_GEN) webhook paths="./api/..." output:webhook:artifacts:config=config/webhook
-	$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./controllers" output:rbac:artifacts:config=config/rbac
+	$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/controllers" output:rbac:artifacts:config=config/rbac
 	# Hub
 	$(CONTROLLER_GEN) crd paths="./api-hub/..." output:crd:artifacts:config=config/crd-hub/bases
 	$(CONTROLLER_GEN) webhook paths="./api-hub/..." output:webhook:artifacts:config=config/webhook-hub
 	$(CONTROLLER_GEN) \
 		rbac:roleName=manager-role \
-		paths="./controllers/hub" \
-		paths="controllers/imagestream_reconciler.go" \
+		paths="./internal/controllers/hub" \
+		paths="internal/controllers/imagestream_reconciler.go" \
 		output:rbac:artifacts:config=config/rbac-hub
 
 .PHONY: generate

diff --git a/cmd/manager-hub/main.go b/cmd/manager-hub/main.go
@@ -41,15 +41,15 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"github.com/rh-ecosystem-edge/kernel-module-management/api-hub/v1beta1"
-	"github.com/rh-ecosystem-edge/kernel-module-management/controllers"
-	"github.com/rh-ecosystem-edge/kernel-module-management/controllers/hub"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/auth"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/build"
 	buildocpbuild "github.com/rh-ecosystem-edge/kernel-module-management/internal/build/ocpbuild"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/cache"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/cluster"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/cmd"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/constants"
+	"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers"
+	"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers/hub"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/filter"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/manifestwork"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/metrics"

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -41,13 +41,13 @@ import (
 	buildv1 "github.com/openshift/api/build/v1"
 	imagev1 "github.com/openshift/api/image/v1"
 	kmmv1beta1 "github.com/rh-ecosystem-edge/kernel-module-management/api/v1beta1"
-	"github.com/rh-ecosystem-edge/kernel-module-management/controllers"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/auth"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/build"
 	buildocpbuild "github.com/rh-ecosystem-edge/kernel-module-management/internal/build/ocpbuild"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/cmd"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/config"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/constants"
+	"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/daemonset"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/filter"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/metrics"
@@ -182,14 +182,9 @@ func main() {
 		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleNMCReconcilerName)
 	}
 
-	workerHelper := controllers.NewWorkerHelper(
-		client,
-		controllers.NewPodManager(client, workerImage, scheme),
-	)
-
 	ctx := ctrl.SetupSignalHandler()
 
-	if err = controllers.NewNodeModulesConfigReconciler(client, workerHelper).SetupWithManager(ctx, mgr); err != nil {
+	if err = controllers.NewNMCReconciler(client, scheme, workerImage).SetupWithManager(ctx, mgr); err != nil {
 		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeModulesConfigReconcilerName)
 	}
 

diff --git a/...rs/hub/managedclustermodule_reconciler.go → ...rs/hub/managedclustermodule_reconciler.go b/...rs/hub/managedclustermodule_reconciler.go → ...rs/hub/managedclustermodule_reconciler.go
diff --git a/...b/managedclustermodule_reconciler_test.go → ...b/managedclustermodule_reconciler_test.go b/...b/managedclustermodule_reconciler_test.go → ...b/managedclustermodule_reconciler_test.go
diff --git a/controllers/hub/suite_test.go → internal/controllers/hub/suite_test.go b/controllers/hub/suite_test.go → internal/controllers/hub/suite_test.go
diff --git a/controllers/imagestream_reconciler.go → ...nal/controllers/imagestream_reconciler.go b/controllers/imagestream_reconciler.go → ...nal/controllers/imagestream_reconciler.go
diff --git a/controllers/imagestream_reconciler_test.go → ...ontrollers/imagestream_reconciler_test.go b/controllers/imagestream_reconciler_test.go → ...ontrollers/imagestream_reconciler_test.go
diff --git a/controllers/mock_module_nmc_reconciler.go → ...controllers/mock_module_nmc_reconciler.go b/controllers/mock_module_nmc_reconciler.go → ...controllers/mock_module_nmc_reconciler.go
diff --git a/controllers/mock_module_reconciler.go → ...nal/controllers/mock_module_reconciler.go b/controllers/mock_module_reconciler.go → ...nal/controllers/mock_module_reconciler.go
diff --git a/...lers/mock_nodemodulesconfig_reconciler.go → internal/controllers/mock_nmc_reconciler.go b/...lers/mock_nodemodulesconfig_reconciler.go → internal/controllers/mock_nmc_reconciler.go
diff --git a/...k_node_label_module_version_reconciler.go → ...k_node_label_module_version_reconciler.go b/...k_node_label_module_version_reconciler.go → ...k_node_label_module_version_reconciler.go
diff --git a/controllers/module_nmc_reconciler.go → ...rnal/controllers/module_nmc_reconciler.go b/controllers/module_nmc_reconciler.go → ...rnal/controllers/module_nmc_reconciler.go
diff --git a/controllers/module_nmc_reconciler_test.go → ...controllers/module_nmc_reconciler_test.go b/controllers/module_nmc_reconciler_test.go → ...controllers/module_nmc_reconciler_test.go
diff --git a/controllers/module_reconciler.go → internal/controllers/module_reconciler.go b/controllers/module_reconciler.go → internal/controllers/module_reconciler.go
diff --git a/controllers/module_reconciler_test.go → ...nal/controllers/module_reconciler_test.go b/controllers/module_reconciler_test.go → ...nal/controllers/module_reconciler_test.go
diff --git a/...lers/module_version_label_action_table.go → ...lers/module_version_label_action_table.go b/...lers/module_version_label_action_table.go → ...lers/module_version_label_action_table.go