[Bug Fix]: Minimal manifest image pull issue (#853)

* fix: updated reverse-proxy version * fix: updated reverseproxy version * fix: updated the conditions * updated image to nightly * fix: unit fixed --------- Co-authored-by: Harish P <harishp8889@gmail.com>
dell · Jan 10, 2025 · e984dc1 · e984dc1
1 parent 4f2abf7
commit e984dc1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/operatorconfig/moduleconfig/common/version-values.yaml b/operatorconfig/moduleconfig/common/version-values.yaml
@@ -56,6 +56,7 @@ powermax:
     observability: "v1.10.0"
     resiliency: "v1.11.0"
   v2.13.0:
+    csireverseproxy: "v2.12.0"
     authorization: "v2.1.0"
     replication: "v1.11.0"
     observability: "v1.11.0"

diff --git a/operatorconfig/moduleconfig/csireverseproxy/v2.12.0/container.yaml b/operatorconfig/moduleconfig/csireverseproxy/v2.12.0/container.yaml
@@ -1,5 +1,5 @@
 name: reverseproxy
-image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0
+image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:nightly
 imagePullPolicy: Always
 env:
   - name: X_CSI_REVPROXY_CONFIG_DIR

diff --git a/pkg/drivers/commonconfig.go b/pkg/drivers/commonconfig.go
@@ -100,14 +100,23 @@ func GetController(ctx context.Context, cr csmv1.ContainerStorageModule, operato
 	for i, c := range containers {
 		if c.Name != nil && string(*c.Name) == "driver" {
 			// Check if Common is not nil before accessing Envs
-			if cr.Spec.Driver.Common != nil && cr.Spec.Driver.Controller != nil {
-				containers[i].Env = utils.ReplaceAllApplyCustomEnvs(c.Env, cr.Spec.Driver.Common.Envs, cr.Spec.Driver.Controller.Envs)
-				c.Env = containers[i].Env
-				if string(cr.Spec.Driver.Common.Image) != "" {
+			if cr.Spec.Driver.Common != nil {
+				if cr.Spec.Driver.Common.Image != "" {
 					image := string(cr.Spec.Driver.Common.Image)
 					c.Image = &image
 				}
 			}
+			if cr.Spec.Driver.Common != nil || cr.Spec.Driver.Controller != nil {
+				var commonEnvs, controllerEnvs []corev1.EnvVar
+				if cr.Spec.Driver.Common != nil {
+					commonEnvs = cr.Spec.Driver.Common.Envs
+				}
+				if cr.Spec.Driver.Controller != nil {
+					controllerEnvs = cr.Spec.Driver.Controller.Envs
+				}
+				containers[i].Env = utils.ReplaceAllApplyCustomEnvs(c.Env, commonEnvs, controllerEnvs)
+				c.Env = containers[i].Env
+			}
 		}
 
 		removeContainer := false