Skip to content

Commit 7e339cb

Browse files
authored
Move controllers to internal/controllers (kubernetes-sigs#519)
Rename NodeModulesConfigReconciler to NMCReconciler. Use private interfaces for the NMCReconciler for consistency.
1 parent f982ca9 commit 7e339cb

29 files changed

+105
-101
lines changed

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ RUN go mod download
1515
COPY api api
1616
COPY api-hub api-hub
1717
COPY cmd cmd
18-
COPY controllers controllers
1918
COPY internal internal
2019

2120
# Copy Makefile

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ help: ## Display this help.
101101
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
102102
$(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=config/crd/bases
103103
$(CONTROLLER_GEN) webhook paths="./api/..." output:webhook:artifacts:config=config/webhook
104-
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./controllers" output:rbac:artifacts:config=config/rbac
104+
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/controllers" output:rbac:artifacts:config=config/rbac
105105
# Hub
106106
$(CONTROLLER_GEN) crd paths="./api-hub/..." output:crd:artifacts:config=config/crd-hub/bases
107107
$(CONTROLLER_GEN) webhook paths="./api-hub/..." output:webhook:artifacts:config=config/webhook-hub
108-
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./controllers/hub" output:rbac:artifacts:config=config/rbac-hub
108+
$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/controllers/hub" output:rbac:artifacts:config=config/rbac-hub
109109

110110
.PHONY: generate
111111
generate: controller-gen mockgen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

cmd/manager-hub/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ import (
3636
_ "k8s.io/client-go/plugin/pkg/client/auth"
3737

3838
"github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
39-
"github.com/kubernetes-sigs/kernel-module-management/controllers/hub"
4039
"github.com/kubernetes-sigs/kernel-module-management/internal/build"
4140
"github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
4241
"github.com/kubernetes-sigs/kernel-module-management/internal/cache"
4342
"github.com/kubernetes-sigs/kernel-module-management/internal/cluster"
4443
"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
4544
"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
45+
"github.com/kubernetes-sigs/kernel-module-management/internal/controllers/hub"
4646
"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
4747
"github.com/kubernetes-sigs/kernel-module-management/internal/manifestwork"
4848
"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"

cmd/manager/main.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import (
3636
_ "k8s.io/client-go/plugin/pkg/client/auth"
3737

3838
v1beta12 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
39-
"github.com/kubernetes-sigs/kernel-module-management/controllers"
4039
"github.com/kubernetes-sigs/kernel-module-management/internal/build"
4140
"github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
4241
"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
4342
"github.com/kubernetes-sigs/kernel-module-management/internal/config"
4443
"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
44+
"github.com/kubernetes-sigs/kernel-module-management/internal/controllers"
4545
"github.com/kubernetes-sigs/kernel-module-management/internal/daemonset"
4646
"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
4747
"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
@@ -164,14 +164,9 @@ func main() {
164164
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleNMCReconcilerName)
165165
}
166166

167-
workerHelper := controllers.NewWorkerHelper(
168-
client,
169-
controllers.NewPodManager(client, workerImage, scheme),
170-
)
171-
172167
ctx := ctrl.SetupSignalHandler()
173168

174-
if err = controllers.NewNodeModulesConfigReconciler(client, workerHelper).SetupWithManager(ctx, mgr); err != nil {
169+
if err = controllers.NewNMCReconciler(client, scheme, workerImage).SetupWithManager(ctx, mgr); err != nil {
175170
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeModulesConfigReconcilerName)
176171
}
177172

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.

0 commit comments

Comments
 (0)