Switch MergeEnvArray argument order for priority

noobaa · Jan 18, 2025 · b4ad545 · b4ad545
1 parent a39ab51
commit b4ad545
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
@@ -479,7 +479,11 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
 	}
 
 	if r.NooBaa.Spec.EnvVariablesOverride != nil && r.NooBaa.Spec.EnvVariablesOverride.Core != nil {
-		util.MergeEnvArrays(&c.Env, &r.NooBaa.Spec.EnvVariablesOverride.Core);
+		// 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;
 	}
 }