Updated the MCM controller to work with the new MIC implementation.

The MCM controller doesn't have to create build/sign pods manually
anymore, all it needs to do is to create 1 MIC object in the cluster per
MCM object per managed cluster.

If all images in an MIC are ready, then the controller can proceed with
creating the manifestWork because it guarantees that the targeted managed
cluster can pull all kmod images successfully.

Signed-off-by: Yoni Bettan <[email protected]>

Author: ybettan

ci/prow/e2e-hub-spoke-incluster-build

@@ -14,11 +14,12 @@ kubectl label node/${MINIKUBE} node-role.kubernetes.io/worker=""
 
 # Init OCM in the cluster
 clusteradm init --wait
-kubectl wait --for=condition=Available deployment/cluster-manager -n open-cluster-management
-kubectl wait --for=condition=Available deployment/cluster-manager-placement-controller -n open-cluster-management-hub
-kubectl wait --for=condition=Available deployment/cluster-manager-registration-controller -n open-cluster-management-hub
-kubectl wait --for=condition=Available deployment/cluster-manager-registration-webhook -n open-cluster-management-hub
-kubectl wait --for=condition=Available deployment/cluster-manager-work-webhook -n open-cluster-management-hub
+kubectl wait --for=condition=Available -n open-cluster-management deployment/cluster-manager
+kubectl wait --for=condition=Available --timeout=2m -n open-cluster-management-hub \
+    deployment/cluster-manager-placement-controller \
+    deployment/cluster-manager-registration-controller \
+    deployment/cluster-manager-registration-webhook \
+    deployment/cluster-manager-work-webhook
 
 # Join the "spoke" cluster to the "hub" cluster (in this case a single cluster is both hub and spoke)
 token=$(clusteradm get token | grep token= | cut -d"=" -f2-)
@@ -49,11 +50,11 @@ clusteradm addon enable addon --names config-policy-controller --clusters ${MINI
 # Install kmm and kmm-hub
 make deploy deploy-hub
 
-kubectl wait --for=condition=Available -n ${OPERATOR_NAMESPACE} \
+kubectl wait --for=condition=Available --timeout=2m -n ${OPERATOR_NAMESPACE} \
   deployment/kmm-operator-hub-controller \
   deployment/kmm-operator-hub-webhook \
   deployment/kmm-operator-controller \
-  deployment/kmm-operator-webhook \
+  deployment/kmm-operator-webhook
 
 # Make the ManagedCluster selected by the ManagedClusterModule
 kubectl label managedcluster minikube name=minikube

cmd/manager-hub/main.go

@@ -21,6 +21,9 @@ import (
 
 	"github.com/kubernetes-sigs/kernel-module-management/internal/config"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/controllers"
+	"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/pod"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -34,8 +37,8 @@ import (
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
-	buildpod "github.com/kubernetes-sigs/kernel-module-management/internal/build/pod"
+	hubv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
+	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	buildsignpod "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cluster"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/cmd"
@@ -47,7 +50,6 @@ import (
 	"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/registry"
-	signpod "github.com/kubernetes-sigs/kernel-module-management/internal/sign/pod"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
 	//+kubebuilder:scaffold:imports
 )
@@ -56,7 +58,8 @@ var scheme = runtime.NewScheme()
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(v1beta1.AddToScheme(scheme))
+	utilruntime.Must(hubv1beta1.AddToScheme(scheme))
+	utilruntime.Must(kmmv1beta1.AddToScheme(scheme))
 	utilruntime.Must(clusterv1.Install(scheme))
 	utilruntime.Must(workv1.Install(scheme))
 	//+kubebuilder:scaffold:scheme
@@ -109,21 +112,11 @@ func main() {
 
 	registryAPI := registry.NewRegistry()
 	buildSignCombiner := module.NewCombiner()
-	buildSignPodAPI := buildsignpod.NewBuildSignPodManager(client, buildSignCombiner, scheme)
 
-	buildAPI := buildpod.NewBuildManager(
-		client,
-		buildpod.NewMaker(client, buildSignCombiner, buildSignPodAPI, scheme),
-		buildSignPodAPI,
-		registryAPI,
-	)
-
-	signAPI := signpod.NewSignPodManager(
-		client,
-		signpod.NewSigner(client, scheme, buildSignPodAPI),
-		buildSignPodAPI,
-		registryAPI,
-	)
+	micAPI := mic.New(client, scheme)
+	mbscAPI := mbsc.New(client, scheme)
+	imagePullerAPI := pod.NewImagePuller(client, scheme)
+	builSignAPI := buildsignpod.NewManager(client, buildSignCombiner, scheme)
 
 	kernelAPI := module.NewKernelMapper(buildSignCombiner)
 
@@ -135,11 +128,20 @@ func main() {
 	mcmr := hub.NewManagedClusterModuleReconciler(
 		client,
 		manifestwork.NewCreator(client, scheme, kernelAPI, registryAPI, operatorNamespace),
-		cluster.NewClusterAPI(client, kernelAPI, buildAPI, signAPI, operatorNamespace),
+		cluster.NewClusterAPI(client, kernelAPI, operatorNamespace),
 		statusupdater.NewManagedClusterModuleStatusUpdater(client),
 		filterAPI,
+		micAPI,
 	)
 
+	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 err = controllers.NewMBSCReconciler(client, builSignAPI, mbscAPI).SetupWithManager(mgr); err != nil {
+		cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.MBSCReconcilerName)
+	}
+
 	if err = mcmr.SetupWithManager(mgr); err != nil {
 		cmd.FatalError(ctrlLogger, err, "unable to create controller")
 	}

config/rbac-hub/role.yaml

@@ -55,6 +55,37 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - kmm.sigs.x-k8s.io
+  resources:
+  - modulebuildsignconfigs
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - kmm.sigs.x-k8s.io
+  resources:
+  - modulebuildsignconfigs/status
+  - moduleimagesconfigs/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - kmm.sigs.x-k8s.io
+  resources:
+  - moduleimagesconfigs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - watch
 - apiGroups:
   - work.open-cluster-management.io
   resources: