Skip to content

Commit 35589fe

Browse files
qbarrandqbarrand
authored
Move controllers to internal/controllers (kubernetes-sigs#519) (kubernetes-sigs#715)
Rename NodeModulesConfigReconciler to NMCReconciler. Use private interfaces for the NMCReconciler for consistency. Upstream-Commit: 7e339cb
1 parent 2433383 commit 35589fe

33 files changed

+107
-103
lines changed

‎Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ COPY vendor vendor
1212
COPY api api
1313
COPY api-hub api-hub
1414
COPY cmd cmd
15-
COPY controllers controllers
1615
COPY docs.mk docs.mk
1716
COPY internal internal
1817

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ help: ## Display this help.
106106
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
107107
$(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=config/crd/bases
108108
$(CONTROLLER_GEN) webhook paths="./api/..." output:webhook:artifacts:config=config/webhook
109-
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./controllers" output:rbac:artifacts:config=config/rbac
109+
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/controllers" output:rbac:artifacts:config=config/rbac
110110
# Hub
111111
$(CONTROLLER_GEN) crd paths="./api-hub/..." output:crd:artifacts:config=config/crd-hub/bases
112112
$(CONTROLLER_GEN) webhook paths="./api-hub/..." output:webhook:artifacts:config=config/webhook-hub
113113
$(CONTROLLER_GEN) \
114114
rbac:roleName=manager-role \
115-
paths="./controllers/hub" \
116-
paths="controllers/imagestream_reconciler.go" \
115+
paths="./internal/controllers/hub" \
116+
paths="internal/controllers/imagestream_reconciler.go" \
117117
output:rbac:artifacts:config=config/rbac-hub
118118

119119
.PHONY: generate

‎cmd/manager-hub/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ import (
4141
_ "k8s.io/client-go/plugin/pkg/client/auth"
4242

4343
"github.com/rh-ecosystem-edge/kernel-module-management/api-hub/v1beta1"
44-
"github.com/rh-ecosystem-edge/kernel-module-management/controllers"
45-
"github.com/rh-ecosystem-edge/kernel-module-management/controllers/hub"
4644
"github.com/rh-ecosystem-edge/kernel-module-management/internal/auth"
4745
"github.com/rh-ecosystem-edge/kernel-module-management/internal/build"
4846
buildocpbuild "github.com/rh-ecosystem-edge/kernel-module-management/internal/build/ocpbuild"
4947
"github.com/rh-ecosystem-edge/kernel-module-management/internal/cache"
5048
"github.com/rh-ecosystem-edge/kernel-module-management/internal/cluster"
5149
"github.com/rh-ecosystem-edge/kernel-module-management/internal/cmd"
5250
"github.com/rh-ecosystem-edge/kernel-module-management/internal/constants"
51+
"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers"
52+
"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers/hub"
5353
"github.com/rh-ecosystem-edge/kernel-module-management/internal/filter"
5454
"github.com/rh-ecosystem-edge/kernel-module-management/internal/manifestwork"
5555
"github.com/rh-ecosystem-edge/kernel-module-management/internal/metrics"

‎cmd/manager/main.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ import (
4141
buildv1 "github.com/openshift/api/build/v1"
4242
imagev1 "github.com/openshift/api/image/v1"
4343
kmmv1beta1 "github.com/rh-ecosystem-edge/kernel-module-management/api/v1beta1"
44-
"github.com/rh-ecosystem-edge/kernel-module-management/controllers"
4544
"github.com/rh-ecosystem-edge/kernel-module-management/internal/auth"
4645
"github.com/rh-ecosystem-edge/kernel-module-management/internal/build"
4746
buildocpbuild "github.com/rh-ecosystem-edge/kernel-module-management/internal/build/ocpbuild"
4847
"github.com/rh-ecosystem-edge/kernel-module-management/internal/cmd"
4948
"github.com/rh-ecosystem-edge/kernel-module-management/internal/config"
5049
"github.com/rh-ecosystem-edge/kernel-module-management/internal/constants"
50+
"github.com/rh-ecosystem-edge/kernel-module-management/internal/controllers"
5151
"github.com/rh-ecosystem-edge/kernel-module-management/internal/daemonset"
5252
"github.com/rh-ecosystem-edge/kernel-module-management/internal/filter"
5353
"github.com/rh-ecosystem-edge/kernel-module-management/internal/metrics"
@@ -182,14 +182,9 @@ func main() {
182182
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleNMCReconcilerName)
183183
}
184184

185-
workerHelper := controllers.NewWorkerHelper(
186-
client,
187-
controllers.NewPodManager(client, workerImage, scheme),
188-
)
189-
190185
ctx := ctrl.SetupSignalHandler()
191186

192-
if err = controllers.NewNodeModulesConfigReconciler(client, workerHelper).SetupWithManager(ctx, mgr); err != nil {
187+
if err = controllers.NewNMCReconciler(client, scheme, workerImage).SetupWithManager(ctx, mgr); err != nil {
193188
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeModulesConfigReconcilerName)
194189
}
195190

‎controllers/hub/managedclustermodule_reconciler.go renamed to ‎internal/controllers/hub/managedclustermodule_reconciler.go

File renamed without changes.

‎controllers/hub/managedclustermodule_reconciler_test.go renamed to ‎internal/controllers/hub/managedclustermodule_reconciler_test.go

File renamed without changes.

‎controllers/hub/suite_test.go renamed to ‎internal/controllers/hub/suite_test.go

File renamed without changes.

‎controllers/imagestream_reconciler.go renamed to ‎internal/controllers/imagestream_reconciler.go

File renamed without changes.

‎controllers/imagestream_reconciler_test.go renamed to ‎internal/controllers/imagestream_reconciler_test.go

File renamed without changes.

‎controllers/mock_module_nmc_reconciler.go renamed to ‎internal/controllers/mock_module_nmc_reconciler.go

File renamed without changes.

‎controllers/mock_module_reconciler.go renamed to ‎internal/controllers/mock_module_reconciler.go

File renamed without changes.

‎controllers/mock_nodemodulesconfig_reconciler.go renamed to ‎internal/controllers/mock_nmc_reconciler.go

+47-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/mock_node_label_module_version_reconciler.go renamed to ‎internal/controllers/mock_node_label_module_version_reconciler.go

File renamed without changes.

‎controllers/module_nmc_reconciler.go renamed to ‎internal/controllers/module_nmc_reconciler.go

File renamed without changes.

‎controllers/module_nmc_reconciler_test.go renamed to ‎internal/controllers/module_nmc_reconciler_test.go

File renamed without changes.

‎controllers/module_reconciler.go renamed to ‎internal/controllers/module_reconciler.go

File renamed without changes.

‎controllers/module_reconciler_test.go renamed to ‎internal/controllers/module_reconciler_test.go

File renamed without changes.

‎controllers/module_version_label_action_table.go renamed to ‎internal/controllers/module_version_label_action_table.go

File renamed without changes.

0 commit comments

Comments
 (0)