Adding ModuleImagesConfig funtionality.

The `Module` reconciler will now generate and update
`ModuleImagesConfig`s objects in the cluster.

At this point, those objects aren't reconciled by any controller but
they will in the upcoming commits.

Signed-off-by: Yoni Bettan <yonibettan@gmail.com>

Author: ybettan

cmd/manager/main.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"strconv"
 
+	"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/api/v1beta1"
@@ -122,6 +123,7 @@ func main() {
 	buildHelperAPI := build.NewHelper()
 	nodeAPI := node.NewNode(client)
 	kernelAPI := module.NewKernelMapper(buildHelperAPI, sign.NewSignerHelper())
+	micAPI := mic.NewModuleImagesConfigAPI(client, scheme)
 
 	dpc := controllers.NewDevicePluginReconciler(
 		client,
@@ -140,6 +142,7 @@ func main() {
 		nmcHelper,
 		filterAPI,
 		nodeAPI,
+		micAPI,
 		scheme,
 	)
 	if err = mnc.SetupWithManager(mgr); err != nil {

config/rbac/role.yaml

@@ -68,33 +68,34 @@ rules:
 - apiGroups:
   - kmm.sigs.x-k8s.io
   resources:
-  - modules
+  - moduleimagesconfigs
+  - nodemodulesconfigs
   verbs:
+  - create
+  - delete
   - get
   - list
   - patch
-  - update
   - watch
 - apiGroups:
   - kmm.sigs.x-k8s.io
   resources:
-  - modules/status
-  - preflightvalidations/status
+  - modules
   verbs:
   - get
+  - list
   - patch
   - update
+  - watch
 - apiGroups:
   - kmm.sigs.x-k8s.io
   resources:
-  - nodemodulesconfigs
+  - modules/status
+  - preflightvalidations/status
   verbs:
-  - create
-  - delete
   - get
-  - list
   - patch
-  - watch
+  - update
 - apiGroups:
   - kmm.sigs.x-k8s.io
   resources:

go.mod

@@ -6,6 +6,7 @@ toolchain go1.23.4
 
 require (
 	github.com/a8m/envsubst v1.4.2
+	github.com/apex/log v1.9.0
 	github.com/budougumi0617/cmpmock v0.1.1
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0

go.sum

@@ -12,6 +12,7 @@ import (
 	"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/filter"
 	"github.com/kubernetes-sigs/kernel-module-management/internal/meta"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/mic"
 	"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/node"
@@ -34,6 +35,7 @@ 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"
@@ -52,6 +54,7 @@ type ModuleReconciler struct {
 	nsLabeler   namespaceLabeler
 	reconHelper moduleReconcilerHelperAPI
 	nodeAPI     node.Node
+	micAPI      mic.ModuleImagesConfigAPI
 }
 
 func NewModuleReconciler(client client.Client,
@@ -60,13 +63,15 @@ func NewModuleReconciler(client client.Client,
 	nmcHelper nmc.Helper,
 	filter *filter.Filter,
 	nodeAPI node.Node,
+	micAPI mic.ModuleImagesConfigAPI,
 	scheme *runtime.Scheme) *ModuleReconciler {
 	reconHelper := newModuleReconcilerHelper(client, kernelAPI, registryAPI, nmcHelper, scheme)
 	return &ModuleReconciler{
 		filter:      filter,
 		nsLabeler:   newNamespaceLabeler(client),
 		reconHelper: reconHelper,
 		nodeAPI:     nodeAPI,
+		micAPI:      micAPI,
 	}
 }
 
@@ -103,6 +108,18 @@ func (mr *ModuleReconciler) Reconcile(ctx context.Context, mod *kmmv1beta1.Modul
 		return ctrl.Result{}, fmt.Errorf("failed to get list of nodes by selector: %v", err)
 	}
 
+	images, err := mr.reconHelper.prepareImages(ctx, mod, targetedNodes)
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to prepare moduleImagesConfig's images for module %s/%s: %v",
+			mod.Namespace, mod.Name, err)
+	}
+
+	if err := mr.micAPI.HandleModuleImagesConfig(ctx, mod.Name, mod.Namespace, images,
+		mod.Spec.ImageRepoSecret, mod); err != nil {
+
+		return ctrl.Result{}, fmt.Errorf("failed to handle moduleImagesConfig for module %s/%s: %v", mod.Namespace, mod.Name, err)
+	}
+
 	currentNMCs, err := mr.reconHelper.getNMCsByModuleSet(ctx, mod)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to get NMCs for Module %s/%s: %v", mod.Namespace, mod.Name, err)
@@ -137,6 +154,7 @@ func (mr *ModuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		NewControllerManagedBy(mgr).
 		For(&kmmv1beta1.Module{}).
 		Owns(&v1.Pod{}, builder.WithPredicates(filter.ModuleReconcilePodPredicate())).
+		Owns(&kmmv1beta1.ModuleImagesConfig{}, builder.WithPredicates(filter.ModuleReconcileMICPredicate())).
 		Watches(
 			&v1.Node{},
 			handler.EnqueueRequestsFromMapFunc(mr.filter.FindModulesForNMCNodeChange),
@@ -161,6 +179,7 @@ type moduleReconcilerHelperAPI interface {
 	finalizeModule(ctx context.Context, mod *kmmv1beta1.Module) error
 	getNMCsByModuleSet(ctx context.Context, mod *kmmv1beta1.Module) (sets.Set[string], error)
 	prepareSchedulingData(ctx context.Context, mod *kmmv1beta1.Module, targetedNodes []v1.Node, currentNMCs sets.Set[string]) (map[string]schedulingData, []error)
+	prepareImages(ctx context.Context, mod *kmmv1beta1.Module, targetedNodes []v1.Node) ([]kmmv1beta1.ModuleImageSpec, error)
 	enableModuleOnNode(ctx context.Context, mld *api.ModuleLoaderData, node *v1.Node) error
 	disableModuleOnNode(ctx context.Context, modNamespace, modName, nodeName string) error
 	moduleUpdateWorkerPodsStatus(ctx context.Context, mod *kmmv1beta1.Module, targetedNodes []v1.Node) error
@@ -315,6 +334,37 @@ func (mrh *moduleReconcilerHelper) prepareSchedulingData(ctx context.Context,
 	return result, errs
 }
 
+func (mrh *moduleReconcilerHelper) prepareImages(ctx context.Context, mod *kmmv1beta1.Module,
+	targetedNodes []v1.Node) ([]kmmv1beta1.ModuleImageSpec, error) {
+
+	var (
+		res    []kmmv1beta1.ModuleImageSpec
+		errs   []error
+		logger = log.FromContext(ctx)
+	)
+	for _, node := range targetedNodes {
+		kernelVersion := strings.TrimSuffix(node.Status.NodeInfo.KernelVersion, "+")
+		mld, err := mrh.kernelAPI.GetModuleLoaderDataForKernel(mod, kernelVersion)
+		if err != nil {
+			if !errors.Is(err, module.ErrNoMatchingKernelMapping) {
+				logger.Info(utils.WarnString(fmt.Sprintf("internal errors while fetching kernel mapping for kernel %s: %v",
+					kernelVersion, err)))
+				errs = append(errs, fmt.Errorf("failed to get moduleLoaderData for kernel %s: %v", kernelVersion, err))
+			}
+			// node is not targeted by module
+			continue
+		}
+		mis := kmmv1beta1.ModuleImageSpec{
+			Image: mld.ContainerImage,
+			Build: mld.Build,
+			Sign:  mld.Sign,
+		}
+		res = append(res, mis)
+	}
+
+	return res, errors.Join(errs...)
+}
+
 func (mrh *moduleReconcilerHelper) enableModuleOnNode(ctx context.Context, mld *api.ModuleLoaderData, node *v1.Node) error {
 	logger := log.FromContext(ctx)