Switching KMM to work with the new build/sign flow

changing the manager's main to use MIC and MBSC reconcilers instead of
BuildSignReconciler

Author: yevgeny-shnaidman

cmd/manager/main.go

@@ -22,26 +22,23 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/kubernetes-sigs/kernel-module-management/internal/mbsc"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/mic"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/node"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/pod"
 
 	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	"github.com/kubernetes-sigs/kernel-module-management/api/v1beta2"
-	buildpod "github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/buildsign"
 	buildsignpod "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/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/controllers"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/module"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/nmc"
-	"github.com/kubernetes-sigs/kernel-module-management/internal/preflight"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
-	signpod "github.com/kubernetes-sigs/kernel-module-management/internal/sign/pod"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -124,6 +121,8 @@ func main() {
 	nodeAPI := node.NewNode(client)
 	kernelAPI := module.NewKernelMapper(buildSignHelperAPI)
 	micAPI := mic.New(client, scheme)
+	mbscAPI := mbsc.New(client, scheme)
+	imagePullerAPI := pod.NewImagePuller(client, scheme)
 
 	dpc := controllers.NewDevicePluginReconciler(
 		client,
@@ -168,6 +167,10 @@ func main() {
 		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeLabelModuleVersionReconcilerName)
 	}
 
+	if err = controllers.NewMICReconciler(client, micAPI, mbscAPI, imagePullerAPI, scheme).SetupWithManager(mgr); err != nil {
+		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.MICReconcilerName)
+	}
+
 	if managed {
 		setupLogger.Info("Starting as managed")
 
@@ -179,30 +182,38 @@ func main() {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.NodeKernelClusterClaimReconcilerName)
 		}
 	} else {
-		buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client)
-
-		buildAPI := buildpod.NewBuildManager(
-			client,
-			buildpod.NewMaker(client, buildSignHelperAPI, buildSignPodAPI, scheme),
-			buildSignPodAPI,
-			registryAPI,
-		)
-
-		signAPI := signpod.NewSignPodManager(
-			client,
-			signpod.NewSigner(client, scheme, buildSignPodAPI),
-			buildSignPodAPI,
-			registryAPI,
-		)
-		bsc := controllers.NewBuildSignReconciler(
-			client,
-			buildAPI,
-			signAPI,
-			kernelAPI,
-			filterAPI,
-			nodeAPI)
-		if err = bsc.SetupWithManager(mgr, constants.KernelLabel); err != nil {
-			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.BuildSignReconcilerName)
+		/*
+			buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client)
+
+			buildAPI := buildpod.NewBuildManager(
+				client,
+				buildpod.NewMaker(client, buildSignHelperAPI, buildSignPodAPI, scheme),
+				buildSignPodAPI,
+				registryAPI,
+			)
+
+			signAPI := signpod.NewSignPodManager(
+				client,
+				signpod.NewSigner(client, scheme, buildSignPodAPI),
+				buildSignPodAPI,
+				registryAPI,
+			)
+			bsc := controllers.NewBuildSignReconciler(
+				client,
+				buildAPI,
+				signAPI,
+				kernelAPI,
+				filterAPI,
+				nodeAPI)
+			if err = bsc.SetupWithManager(mgr, constants.KernelLabel); err != nil {
+				cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.BuildSignReconcilerName)
+			}
+		*/
+		builSignAPI := buildsignpod.NewManager(client, buildSignHelperAPI, scheme)
+
+		mbscr := controllers.NewMBSCReconciler(client, builSignAPI, mbscAPI)
+		if err = mbscr.SetupWithManager(mgr); err != nil {
+			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.MBSCReconcilerName)
 		}
 
 		helper := controllers.NewJobEventReconcilerHelper(client)
@@ -215,12 +226,15 @@ func main() {
 			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.JobGCReconcilerName)
 		}
 
-		preflightStatusUpdaterAPI := preflight.NewStatusUpdater(client)
-		preflightAPI := preflight.NewPreflightAPI(client, buildAPI, signAPI, registryAPI, preflightStatusUpdaterAPI, kernelAPI)
+		//[TODO] - update the preflight flow with the MIC/MBSC implementation and then uncomment the preflight conroller
+		/*
+			preflightStatusUpdaterAPI := preflight.NewStatusUpdater(client)
+			preflightAPI := preflight.NewPreflightAPI(client, buildAPI, signAPI, registryAPI, preflightStatusUpdaterAPI, kernelAPI)
 
-		if err = controllers.NewPreflightValidationReconciler(client, filterAPI, metricsAPI, preflightStatusUpdaterAPI, preflightAPI).SetupWithManager(mgr); err != nil {
-			cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.PreflightValidationReconcilerName)
-		}
+			if err = controllers.NewPreflightValidationReconciler(client, filterAPI, metricsAPI, preflightStatusUpdaterAPI, preflightAPI).SetupWithManager(mgr); err != nil {
+				cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.PreflightValidationReconcilerName)
+			}
+		*/
 	}
 
 	//+kubebuilder:scaffold:builder

config/rbac/role.yaml

@@ -80,6 +80,7 @@ rules:
   - kmm.sigs.x-k8s.io
   resources:
   - modulebuildsignconfigs/status
+  - moduleimagesconfigs/status
   - modules/status
   - preflightvalidations/status
   verbs:

internal/controllers/mbsc_reconciler.go

@@ -53,7 +53,7 @@ func NewMBSCReconciler(
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *mbscReconciler) SetupWithManager(mgr ctrl.Manager, kernelLabel string) error {
+func (r *mbscReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&kmmv1beta1.ModuleBuildSignConfig{}).
 		Owns(&v1.Pod{}).

internal/controllers/mic_reconciler.go

@@ -63,6 +63,9 @@ func (r *micReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		)
 }
 
+//+kubebuilder:rbac:groups=kmm.sigs.x-k8s.io,resources=moduleimagesconfigs,verbs=get;list;watch;patch;create;delete
+//+kubebuilder:rbac:groups=kmm.sigs.x-k8s.io,resources=moduleimagesconfigs/status,verbs=get;update;patch
+
 func (r *micReconciler) Reconcile(ctx context.Context, micObj *kmmv1beta1.ModuleImagesConfig) (ctrl.Result, error) {
 	res := ctrl.Result{}
 	if micObj.GetDeletionTimestamp() != nil {

internal/controllers/module_reconciler.go

@@ -35,7 +35,6 @@ import (
 //+kubebuilder:rbac:groups="core",resources=namespaces,verbs=get;list;patch;watch
 //+kubebuilder:rbac:groups="core",resources=nodes,verbs=get;watch
 //+kubebuilder:rbac:groups=kmm.sigs.x-k8s.io,resources=nodemodulesconfigs,verbs=get;list;watch;patch;create;delete
-//+kubebuilder:rbac:groups=kmm.sigs.x-k8s.io,resources=moduleimagesconfigs,verbs=get;list;watch;patch;create;delete
 
 const (
 	ModuleReconcilerName = "ModuleReconciler"