fix: add support for imagePullPolicy for installer daemonsets (confid…

…ential-containers#395) Signed-off-by: Teodor <teodor.pripoae@gmail.com>
teodor-pripoae · Jul 18, 2024 · 63e716c · 63e716c
1 parent 29bea08
commit 63e716c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/controllers/ccruntime_controller.go b/controllers/ccruntime_controller.go
@@ -713,7 +713,7 @@ func (r *CcRuntimeReconciler) processDaemonset(operation DaemonOperation) *appsv
 						{
 							Name:            "cc-runtime-install-pod",
 							Image:           r.ccRuntime.Spec.Config.PayloadImage,
-							ImagePullPolicy: "Always",
+							ImagePullPolicy: imagePullPolicyOrDefault(r.ccRuntime.Spec.Config.ImagePullPolicy),
 							Lifecycle:       preStopHook,
 							SecurityContext: &corev1.SecurityContext{
 								// TODO - do we really need to run as root?
@@ -908,7 +908,7 @@ func (r *CcRuntimeReconciler) makeHookDaemonset(operation DaemonOperation) *apps
 						{
 							Name:            "cc-runtime-" + string(operation) + "-pod",
 							Image:           image,
-							ImagePullPolicy: "Always",
+							ImagePullPolicy: imagePullPolicyOrDefault(r.ccRuntime.Spec.Config.ImagePullPolicy),
 							SecurityContext: &corev1.SecurityContext{
 								Privileged: &runPrivileged,
 								RunAsUser:  &runAsUser,

diff --git a/controllers/common.go b/controllers/common.go
@@ -1,5 +1,9 @@
 package controllers
 
+import (
+	corev1 "k8s.io/api/core/v1"
+)
+
 // DaemonOperation represents the operation the daemon is going to perform
 type DaemonOperation string
 
@@ -26,6 +30,8 @@ const (
 	UpgradeOperation DaemonOperation = "upgrade"
 
 	RuntimeConfigFinalizer = "runtimeconfig.confidentialcontainers.org/finalizer"
+
+	DefaultImagePullPolicy = corev1.PullAlways
 )
 
 func contains(list []string, s string) bool {
@@ -36,3 +42,10 @@ func contains(list []string, s string) bool {
 	}
 	return false
 }
+
+func imagePullPolicyOrDefault(policy corev1.PullPolicy) corev1.PullPolicy {
+	if policy == "" {
+		return DefaultImagePullPolicy
+	}
+	return policy
+}