Wip core sts variable injection

NoOverflow · NoOverflow · commit 579875140949 · 2025-01-17T17:23:51.000+01:00
diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
@@ -478,6 +478,9 @@ 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(&c.Env, &r.NooBaa.Spec.EnvVariablesOverride.Core);
+	}
 }
 
 // SetDesiredCoreApp updates the CoreApp as desired for reconciling

Original file line number	Diff line number	Diff line change
`@@ -478,6 +478,9 @@ func (r Reconciler) setDesiredCoreEnv(c corev1.Container) {`
`478`	`478`	`util.MergeEnvArrays(&c.Env, &[]corev1.EnvVar{envVar});`
`479`	`479`	`}`
`480`	`480`
	`481`	`+ if r.NooBaa.Spec.EnvVariablesOverride != nil && r.NooBaa.Spec.EnvVariablesOverride.Core != nil {`
	`482`	`+ util.MergeEnvArrays(&c.Env, &r.NooBaa.Spec.EnvVariablesOverride.Core);`
	`483`	`+ }`
`481`	`484`	`}`
`482`	`485`
`483`	`486`	`// SetDesiredCoreApp updates the CoreApp as desired for reconciling`