Skip to content

Add the NodeModulesConfig controller #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Add the NodeModulesConfig controller #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions api/v1beta1/nodemodulesconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ type ModuleConfig struct {
}

type NodeModuleSpec struct {
Name string `json:"name"`
Namespace string `json:"namespace"`
Config ModuleConfig `json:"config"`
Name string `json:"name"`
Namespace string `json:"namespace"`
Config ModuleConfig `json:"config"`
ServiceAccountName string `json:"serviceAccountName"`
}

// NodeModulesConfigSpec describes the desired state of modules on the node
Expand Down
18 changes: 15 additions & 3 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import (
"os"
"strconv"

"github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
"github.com/kubernetes-sigs/kernel-module-management/internal/config"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
Expand All @@ -40,7 +38,9 @@ import (
v1beta12 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
"github.com/kubernetes-sigs/kernel-module-management/controllers"
"github.com/kubernetes-sigs/kernel-module-management/internal/build"
"github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
"github.com/kubernetes-sigs/kernel-module-management/internal/config"
"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
"github.com/kubernetes-sigs/kernel-module-management/internal/daemonset"
"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
Expand Down Expand Up @@ -86,6 +86,7 @@ func main() {
}

operatorNamespace := cmd.GetEnvOrFatalError(constants.OperatorNamespaceEnvVar, setupLogger)
workerImage := cmd.GetEnvOrFatalError("RELATED_IMAGES_WORKER", setupLogger)

managed, err := GetBoolEnv("KMM_MANAGED")
if err != nil {
Expand Down Expand Up @@ -163,6 +164,17 @@ func main() {
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleNMCReconcilerName)
}

workerHelper := controllers.NewWorkerHelper(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to create it in main if you make it a private interface

client,
controllers.NewPodManager(client, workerImage, scheme),
)

ctx := ctrl.SetupSignalHandler()

if err = controllers.NewNodeModulesConfigReconciler(client, workerHelper).SetupWithManager(ctx, mgr); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we rename it to NewNMCReconciler? we already have NMC package, and ModuleNMC controller, it seems that it is a clearer name then the whole shabang...

cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeModulesConfigReconcilerName)
}

nodeKernelReconciler := controllers.NewNodeKernelReconciler(client, constants.KernelLabel, filterAPI)

if err = nodeKernelReconciler.SetupWithManager(mgr); err != nil {
Expand Down Expand Up @@ -210,7 +222,7 @@ func main() {
}

setupLogger.Info("starting manager")
if err = mgr.Start(ctrl.SetupSignalHandler()); err != nil {
if err = mgr.Start(ctx); err != nil {
cmd.FatalError(setupLogger, err, "problem running manager")
}
}
Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,13 @@ spec:
type: string
namespace:
type: string
serviceAccountName:
type: string
required:
- config
- name
- namespace
- serviceAccountName
type: object
type: array
type: object
Expand Down
6 changes: 6 additions & 0 deletions config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ kind: Kustomization
resources:
- ../manager-base

patches:
- path: manager_worker_image_patch.yaml

images:
- name: controller
newName: gcr.io/k8s-staging-kmm/kernel-module-management-operator
newTag: latest
- name: worker
newName: gcr.io/k8s-staging-kmm/kernel-module-management-worker
newTag: latest

configMapGenerator:
- files:
Expand Down
13 changes: 13 additions & 0 deletions config/manager/manager_worker_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
containers:
- name: manager
env:
- name: RELATED_IMAGES_WORKER
value: worker
6 changes: 6 additions & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ rules:
- list
- patch
- watch
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- nodemodulesconfigs/status
verbs:
- patch
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
Expand Down
174 changes: 174 additions & 0 deletions controllers/mock_nodemodulesconfig_reconciler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions controllers/module_nmc_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ func (mnrh *moduleNMCReconcilerHelper) enableModuleOnNode(ctx context.Context, m
Modprobe: mld.Modprobe,
}

if tls := mld.RegistryTLS; tls != nil {
moduleConfig.InsecurePull = tls.Insecure || tls.InsecureSkipTLSVerify
}

nmc := &kmmv1beta1.NodeModulesConfig{
ObjectMeta: metav1.ObjectMeta{Name: nodeName},
}
Expand Down
Loading