Add EnvVariablesOverride field for endpoint deployment

noobaa · Jan 19, 2025 · 5e03e1e · 5e03e1e
1 parent b4ad545
commit 5e03e1e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 13 deletions.
diff --git a/deploy/crds/noobaa.io_noobaas.yaml b/deploy/crds/noobaa.io_noobaas.yaml
@@ -1644,11 +1644,19 @@ spec:
                       type: object
                   type: object
                 envVariablesOverride:
-                  description: "huh"
+                  description: Override variables for all pods managed by NooBaa's operator
                   type: object
                   properties:
                     core:
-                      description: "List of environment variables to set in the Core statefulset container. Cannot be updated."
+                      description: "List of environment variables to set in the Core statefulset containers."
+                      items:
+                        description: EnvVar represents an environment variable present in a Container.
+                        x-kubernetes-preserve-unknown-fields: true
+                        type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                      type: array
+                    endpoint:
+                      description: "List of environment variables to set in the Endpoint deployment containers."
                       items:
                         description: EnvVar represents an environment variable present in a Container.
                         x-kubernetes-preserve-unknown-fields: true

diff --git a/pkg/apis/noobaa/v1alpha1/noobaa_types.go b/pkg/apis/noobaa/v1alpha1/noobaa_types.go
@@ -254,6 +254,9 @@ type AutoscalerSpec struct {
 type EnvVariablesOverrideSpec struct {
 	// Variables override for core statefulset
 	Core []corev1.EnvVar `json:"core,omitempty"`
+
+	// Variables override for endpoint deployment
+	Endpoint []corev1.EnvVar `json:"endpoint,omitempty"`
 }
 
 

diff --git a/pkg/bundle/deploy.go b/pkg/bundle/deploy.go
@@ -1423,7 +1423,7 @@ spec:
       status: {}
 `
 
-const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "c354dda7e40756f33fe9daf07a240e92b55ac9c537bdf51101e8fe0f47cefc7e"
+const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "d159d72a783f65f4c9ff716fc2c2c7ba4983c36d73ad3ca3b29c87cfe3707767"
 
 const File_deploy_crds_noobaa_io_noobaas_yaml = `---
 apiVersion: apiextensions.k8s.io/v1
@@ -3071,11 +3071,19 @@ spec:
                       type: object
                   type: object
                 envVariablesOverride:
-                  description: "huh"
+                  description: Override variables for all pods managed by NooBaa's operator
                   type: object
                   properties:
                     core:
-                      description: "List of environment variables to set in the Core statefulset container. Cannot be updated."
+                      description: "List of environment variables to set in the Core statefulset containers."
+                      items:
+                        description: EnvVar represents an environment variable present in a Container.
+                        x-kubernetes-preserve-unknown-fields: true
+                        type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                      type: array
+                    endpoint:
+                      description: "List of environment variables to set in the Endpoint deployment containers."
                       items:
                         description: EnvVar represents an environment variable present in a Container.
                         x-kubernetes-preserve-unknown-fields: true

diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
@@ -477,14 +477,6 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
 		}
 		util.MergeEnvArrays(&c.Env, &[]corev1.EnvVar{envVar});
 	}
-
-	if r.NooBaa.Spec.EnvVariablesOverride != nil && r.NooBaa.Spec.EnvVariablesOverride.Core != nil {
-		// util.MergeEnvArrays will keep variables of the first array provided in
-		// arguments in case of a conflict, so we provide the override array first
-		// and then set the container Env array to the resulting merged array
-		util.MergeEnvArrays(&r.NooBaa.Spec.EnvVariablesOverride.Core, &c.Env);
-		c.Env = r.NooBaa.Spec.EnvVariablesOverride.Core;
-	}
 }
 
 // SetDesiredCoreApp updates the CoreApp as desired for reconciling
@@ -623,6 +615,14 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 				util.MergeVolumeMountList(&c.VolumeMounts, &configMapVolumeMounts)
 			}
 		}
+
+		if r.NooBaa.Spec.EnvVariablesOverride != nil && r.NooBaa.Spec.EnvVariablesOverride.Core != nil {
+			// util.MergeEnvArrays will keep variables of the first array provided in
+			// arguments in case of a conflict, so we provide the override array first
+			// and then set the container Env array to the resulting merged array
+			util.MergeEnvArrays(&r.NooBaa.Spec.EnvVariablesOverride.Core, &c.Env);
+			c.Env = r.NooBaa.Spec.EnvVariablesOverride.Core;
+		}
 	}
 	if r.NooBaa.Spec.ImagePullSecret == nil {
 		podSpec.ImagePullSecrets =

diff --git a/pkg/system/phase4_configuring.go b/pkg/system/phase4_configuring.go
@@ -440,6 +440,13 @@ func (r *Reconciler) SetDesiredDeploymentEndpoint() error {
 
 			r.DeploymentEndpoint.Spec.Template.Annotations["noobaa.io/configmap-hash"] = r.CoreAppConfig.Annotations["noobaa.io/configmap-hash"]
 
+			if r.NooBaa.Spec.EnvVariablesOverride != nil && r.NooBaa.Spec.EnvVariablesOverride.Endpoint != nil {
+				// util.MergeEnvArrays will keep variables of the first array provided in
+				// arguments in case of a conflict, so we provide the override array first
+				// and then set the container Env array to the resulting merged array
+				util.MergeEnvArrays(&r.NooBaa.Spec.EnvVariablesOverride.Endpoint, &c.Env);
+				c.Env = r.NooBaa.Spec.EnvVariablesOverride.Endpoint;
+			}
 			return r.setDesiredEndpointMounts(podSpec, c)
 		}
 	}