Using the Module's spec.moduleLoader.container.imagePullPolicy. (rh…

…-ecosystem-edge#1203) When we moved to the worker-pod implementation in v2 we started to pull kmod images via HTTP from teh worker-pod directly and we ignored this field. Now that we moved to pulling using the cluster's container-runtime, the `imagePullPolicy` can be passed to the init-container definition. Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
ybettan · Sep 9, 2024 · da1e656 · da1e656
1 parent 4778041
commit da1e656
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 10 deletions.
diff --git a/api/v1beta1/nodemodulesconfig_types.go b/api/v1beta1/nodemodulesconfig_types.go
@@ -24,6 +24,8 @@ import (
 type ModuleConfig struct {
 	KernelVersion  string `json:"kernelVersion"`
 	ContainerImage string `json:"containerImage"`
+	// +kubebuilder:default=IfNotPresent
+	ImagePullPolicy v1.PullPolicy `json:"imagePullPolicy"`
 	// When InsecurePull is true, the container image can be pulled without TLS.
 	InsecurePull bool `json:"insecurePull"`
 	//+optional

diff --git a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
@@ -37,7 +37,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-09-03T16:21:51Z"
+    createdAt: "2024-09-08T06:59:15Z"
     operatorframework.io/suggested-namespace: openshift-kmm-hub
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

diff --git a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml
@@ -63,7 +63,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-09-03T16:21:50Z"
+    createdAt: "2024-09-08T06:59:14Z"
     operatorframework.io/suggested-namespace: openshift-kmm
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

diff --git a/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml b/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
@@ -58,6 +58,11 @@ spec:
                       properties:
                         containerImage:
                           type: string
+                        imagePullPolicy:
+                          default: IfNotPresent
+                          description: PullPolicy describes a policy for if/when to
+                            pull a container image
+                          type: string
                         inTreeModuleToRemove:
                           type: string
                         inTreeModulesToRemove:
@@ -155,6 +160,7 @@ spec:
                           type: object
                       required:
                       - containerImage
+                      - imagePullPolicy
                       - insecurePull
                       - kernelVersion
                       - modprobe
@@ -201,6 +207,11 @@ spec:
                       properties:
                         containerImage:
                           type: string
+                        imagePullPolicy:
+                          default: IfNotPresent
+                          description: PullPolicy describes a policy for if/when to
+                            pull a container image
+                          type: string
                         inTreeModuleToRemove:
                           type: string
                         inTreeModulesToRemove:
@@ -298,6 +309,7 @@ spec:
                           type: object
                       required:
                       - containerImage
+                      - imagePullPolicy
                       - insecurePull
                       - kernelVersion
                       - modprobe

diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
@@ -54,6 +54,11 @@ spec:
                       properties:
                         containerImage:
                           type: string
+                        imagePullPolicy:
+                          default: IfNotPresent
+                          description: PullPolicy describes a policy for if/when to
+                            pull a container image
+                          type: string
                         inTreeModuleToRemove:
                           type: string
                         inTreeModulesToRemove:
@@ -151,6 +156,7 @@ spec:
                           type: object
                       required:
                       - containerImage
+                      - imagePullPolicy
                       - insecurePull
                       - kernelVersion
                       - modprobe
@@ -197,6 +203,11 @@ spec:
                       properties:
                         containerImage:
                           type: string
+                        imagePullPolicy:
+                          default: IfNotPresent
+                          description: PullPolicy describes a policy for if/when to
+                            pull a container image
+                          type: string
                         inTreeModuleToRemove:
                           type: string
                         inTreeModulesToRemove:
@@ -294,6 +305,7 @@ spec:
                           type: object
                       required:
                       - containerImage
+                      - imagePullPolicy
                       - insecurePull
                       - kernelVersion
                       - modprobe

diff --git a/internal/controllers/module_nmc_reconciler.go b/internal/controllers/module_nmc_reconciler.go
@@ -362,6 +362,7 @@ func (mnrh *moduleNMCReconcilerHelper) enableModuleOnNode(ctx context.Context, m
 	moduleConfig := kmmv1beta1.ModuleConfig{
 		KernelVersion:         mld.KernelVersion,
 		ContainerImage:        mld.ContainerImage,
+		ImagePullPolicy:       mld.ImagePullPolicy,
 		InTreeModulesToRemove: mld.InTreeModulesToRemove,
 		Modprobe:              mld.Modprobe,
 	}

diff --git a/internal/controllers/nmc_reconciler.go b/internal/controllers/nmc_reconciler.go
@@ -1141,10 +1141,11 @@ func (p *podManagerImpl) baseWorkerPod(ctx context.Context, nmc client.Object, i
 		Spec: v1.PodSpec{
 			InitContainers: []v1.Container{
 				{
-					Name:    initContainerName,
-					Image:   moduleConfig.ContainerImage,
-					Command: []string{"/bin/sh", "-c"},
-					Args:    []string{""},
+					Name:            initContainerName,
+					Image:           moduleConfig.ContainerImage,
+					ImagePullPolicy: moduleConfig.ImagePullPolicy,
+					Command:         []string{"/bin/sh", "-c"},
+					Args:            []string{""},
 					VolumeMounts: []v1.VolumeMount{
 						{
 							Name:      volNameTmp,

diff --git a/internal/controllers/nmc_reconciler_test.go b/internal/controllers/nmc_reconciler_test.go
@@ -261,6 +261,7 @@ var _ = Describe("NodeModulesConfigReconciler_Reconcile", func() {
 var moduleConfig = kmmv1beta1.ModuleConfig{
 	KernelVersion:         "kernel-version",
 	ContainerImage:        "container image",
+	ImagePullPolicy:       v1.PullIfNotPresent,
 	InsecurePull:          true,
 	InTreeModulesToRemove: []string{"intree1", "intree2"},
 	Modprobe: kmmv1beta1.ModprobeSpec{
@@ -1943,6 +1944,7 @@ func getBaseWorkerPod(subcommand string, owner ctrlclient.Object, firmwareHostPa
 	hostPathDirectoryOrCreate := v1.HostPathDirectoryOrCreate
 
 	configAnnotationValue := `containerImage: container image
+imagePullPolicy: IfNotPresent
 inTreeModulesToRemove:
 - intree1
 - intree2
@@ -2000,10 +2002,11 @@ cp -R /firmware-path/* /tmp/firmware-path;
 		Spec: v1.PodSpec{
 			InitContainers: []v1.Container{
 				{
-					Name:    "image-extractor",
-					Image:   "container image",
-					Command: []string{"/bin/sh", "-c"},
-					Args:    []string{initContainerArg},
+					Name:            "image-extractor",
+					Image:           "container image",
+					ImagePullPolicy: v1.PullIfNotPresent,
+					Command:         []string{"/bin/sh", "-c"},
+					Args:            []string{initContainerArg},
 					Resources: v1.ResourceRequirements{
 						Limits:   limits,
 						Requests: requests,