✨ (helm/v2-alpha): Add manager.envOverrides for CLI env overrides

camilamacedo86 · camilamacedo86 · commit 1e8954d1c31b · 2026-02-21T08:10:36.000Z
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml
@@ -25,6 +25,11 @@ manager:
   ##
   env: []
 
+  ## Env overrides (--set manager.envOverrides.VAR=value)
+  ## Same name in env above: this value takes precedence.
+  ##
+  envOverrides: {}
+
   ## Image pull secrets
   ##
   imagePullSecrets: []
diff --git a/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml b/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml
@@ -25,6 +25,11 @@ manager:
   ##
   env: []
 
+  ## Env overrides (--set manager.envOverrides.VAR=value)
+  ## Same name in env above: this value takes precedence.
+  ##
+  envOverrides: {}
+
   ## Image pull secrets
   ##
   imagePullSecrets: []
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml
@@ -25,6 +25,11 @@ manager:
   ##
   env: []
 
+  ## Env overrides (--set manager.envOverrides.VAR=value)
+  ## Same name in env above: this value takes precedence.
+  ##
+  envOverrides: {}
+
   ## Image pull secrets
   ##
   imagePullSecrets: []
diff --git a/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater.go b/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater.go
@@ -611,21 +611,36 @@ func (t *HelmTemplater) templateEnvironmentVariables(yamlContent string) string
 			}
 		}
 
-		if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.manager.env") {
+		nextLine := ""
+		if i+1 < len(lines) {
+			nextLine = lines[i+1]
+		}
+		if strings.Contains(nextLine, ".Values.manager.env") || strings.Contains(nextLine, "envOverrides") {
 			return yamlContent
 		}
 
 		childIndent := indentStr + "  "
 		childIndentWidth := strconv.Itoa(len(childIndent))
-
-		block := []string{
-			indentStr + "env:",
-			childIndent + "{{- if .Values.manager.env }}",
-			childIndent + "{{- toYaml .Values.manager.env | nindent " + childIndentWidth + " }}",
-			childIndent + "{{- else }}",
-			childIndent + "[]",
-			childIndent + "{{- end }}",
-		}
+		// Env list + envOverrides (CLI --set). Secret refs go in env list.
+		hasEnv := `{{- if or .Values.manager.env (and (kindIs "map" .Values.manager.envOverrides) ` +
+			`(not (empty .Values.manager.envOverrides))) }}`
+		block := make([]string, 0, 22)
+		block = append(block,
+			indentStr+"env:",
+			hasEnv,
+			childIndent+`{{- if .Values.manager.env }}`,
+			childIndent+"{{- toYaml .Values.manager.env | nindent "+childIndentWidth+" }}",
+			childIndent+`{{- end }}`,
+			childIndent+`{{- if kindIs "map" .Values.manager.envOverrides }}`,
+			childIndent+`{{- range $k, $v := .Values.manager.envOverrides }}`,
+			childIndent+`- name: {{ $k }}`,
+			childIndent+`  value: {{ $v | quote }}`,
+			childIndent+`{{ end }}`,
+			childIndent+`{{- end }}`,
+			childIndent+`{{- else }}`,
+			childIndent+"[]",
+			childIndent+`{{- end }}`,
+		)
 
 		newLines := append([]string{}, lines[:i]...)
 		newLines = append(newLines, block...)
diff --git a/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater_test.go b/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater_test.go
@@ -2047,9 +2047,10 @@ spec:
 			Expect(result).To(ContainSubstring("{{- if .Values.manager.resources }}"))
 			Expect(result).To(ContainSubstring("{{- toYaml .Values.manager.resources | nindent"))
 
-			// Should template environment variables
-			Expect(result).To(ContainSubstring("{{- if .Values.manager.env }}"))
-			Expect(result).To(ContainSubstring("{{- toYaml .Values.manager.env | nindent"))
+			// Env list + envOverrides (--set). Secret refs go in env list.
+			Expect(result).To(ContainSubstring(".Values.manager.env"))
+			Expect(result).To(ContainSubstring("toYaml .Values.manager.env"))
+			Expect(result).To(ContainSubstring("envOverrides"))
 
 			// Should template args
 			Expect(result).To(ContainSubstring("{{- range .Values.manager.args }}"))
diff --git a/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic.go b/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic.go
@@ -222,22 +222,7 @@ func (f *HelmValuesBasic) addDeploymentConfig(buf *bytes.Buffer) {
 		return
 	}
 
-	// Add environment variables if they exist
-	if env, exists := f.DeploymentConfig["env"]; exists && env != nil {
-		buf.WriteString("  ## Environment variables\n")
-		buf.WriteString("  ##\n")
-		buf.WriteString("  env:\n")
-		if envYaml, err := yaml.Marshal(env); err == nil {
-			f.IndentYamlProperly(buf, envYaml)
-		} else {
-			buf.WriteString("    []\n")
-		}
-		buf.WriteString("\n")
-	} else {
-		buf.WriteString("  ## Environment variables\n")
-		buf.WriteString("  ##\n")
-		buf.WriteString("  env: []\n\n")
-	}
+	f.addEnvSection(buf)
 
 	// Add image pull secrets
 	if imagePullSecrets, exists := f.DeploymentConfig["imagePullSecrets"]; exists && imagePullSecrets != nil {
@@ -349,11 +334,41 @@ func (f *HelmValuesBasic) IndentYamlProperly(buf *bytes.Buffer, envYaml []byte)
 	}
 }
 
+// addEnvSection writes env (list, same as master) and only adds envOverrides for CLI.
+func (f *HelmValuesBasic) addEnvSection(buf *bytes.Buffer) {
+	buf.WriteString("  ## Environment variables\n")
+	buf.WriteString("  ##\n")
+	if env, exists := f.DeploymentConfig["env"]; exists && env != nil {
+		if list, ok := env.([]any); ok && len(list) > 0 {
+			buf.WriteString("  env:\n")
+			if envYaml, err := yaml.Marshal(list); err == nil {
+				f.IndentYamlProperly(buf, envYaml)
+			}
+		} else {
+			buf.WriteString("  env: []\n")
+		}
+	} else {
+		buf.WriteString("  env: []\n")
+	}
+	buf.WriteString("\n")
+	buf.WriteString("  ## Env overrides (--set manager.envOverrides.VAR=value)\n")
+	buf.WriteString("  ## Same name in env above: this value takes precedence.\n")
+	buf.WriteString("  ##\n")
+	buf.WriteString("  envOverrides: {}\n")
+	buf.WriteString("\n")
+}
+
 // addDefaultDeploymentSections adds default sections when no deployment config is available
 func (f *HelmValuesBasic) addDefaultDeploymentSections(buf *bytes.Buffer) {
 	buf.WriteString("  ## Environment variables\n")
 	buf.WriteString("  ##\n")
-	buf.WriteString("  env: []\n\n")
+	buf.WriteString("  env: []\n")
+	buf.WriteString("\n")
+	buf.WriteString("  ## Env overrides (--set manager.envOverrides.VAR=value)\n")
+	buf.WriteString("  ## Same name in env above: this value takes precedence.\n")
+	buf.WriteString("  ##\n")
+	buf.WriteString("  envOverrides: {}\n")
+	buf.WriteString("\n")
 
 	f.addDefaultImagePullSecrets(buf)
 	f.addDefaultPodSecurityContext(buf)
diff --git a/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go b/pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go
@@ -52,11 +52,19 @@ var _ = Describe("HelmValuesBasic", func() {
 			Expect(content).To(ContainSubstring("manager:"))
 			Expect(content).To(ContainSubstring("args: []"))
 			Expect(content).To(ContainSubstring("env: []"))
+			Expect(content).To(ContainSubstring("envOverrides: {}"))
 			Expect(content).To(ContainSubstring("metrics:"))
 			Expect(content).To(ContainSubstring("prometheus:"))
 			Expect(content).To(ContainSubstring("rbacHelpers:"))
 			Expect(content).To(ContainSubstring("imagePullSecrets: []"))
 		})
+
+		It("should include env list and envOverrides for CLI", func() {
+			content := valuesTemplate.GetBody()
+			Expect(content).To(ContainSubstring("env: []"))
+			Expect(content).To(ContainSubstring("envOverrides: {}"))
+			Expect(content).To(ContainSubstring("--set manager.envOverrides.VAR=value"))
+		})
 	})
 
 	Context("when project has no webhooks", func() {
@@ -153,8 +161,8 @@ var _ = Describe("HelmValuesBasic", func() {
 			Expect(content).To(ContainSubstring("args:"))
 			Expect(content).To(ContainSubstring("- --leader-elect"))
 			Expect(content).To(ContainSubstring("env:"))
-			Expect(content).To(ContainSubstring("name: TEST_ENV"))
-			Expect(content).To(ContainSubstring("value: test-value"))
+			Expect(content).To(ContainSubstring("TEST_ENV"))
+			Expect(content).To(ContainSubstring("test-value"))
 			Expect(content).To(ContainSubstring("repository: example.com/custom-controller"))
 			Expect(content).To(ContainSubstring("tag: v1.2.3"))
 			Expect(content).To(ContainSubstring("pullPolicy: Always"))
@@ -288,7 +296,7 @@ var _ = Describe("HelmValuesBasic", func() {
 		It("should render nested env configuration", func() {
 			content := valuesTemplate.GetBody()
 			Expect(content).To(ContainSubstring("env:"))
-			Expect(content).To(ContainSubstring("name: POD_NAMESPACE"))
+			Expect(content).To(ContainSubstring("POD_NAMESPACE"))
 			Expect(content).To(ContainSubstring("valueFrom:"))
 			Expect(content).To(ContainSubstring("fieldRef:"))
 			Expect(content).To(ContainSubstring("fieldPath: metadata.namespace"))
diff --git a/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml b/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml
@@ -53,8 +53,16 @@ spec:
                   command:
                     - /manager
                   env:
+{{- if or .Values.manager.env (and (kindIs "map" .Values.manager.envOverrides) (not (empty .Values.manager.envOverrides))) }}
                     {{- if .Values.manager.env }}
                     {{- toYaml .Values.manager.env | nindent 20 }}
+                    {{- end }}
+                    {{- if kindIs "map" .Values.manager.envOverrides }}
+                    {{- range $k, $v := .Values.manager.envOverrides }}
+                    - name: {{ $k }}
+                      value: {{ $v | quote }}
+                    {{ end }}
+                    {{- end }}
                     {{- else }}
                     []
                     {{- end }}
diff --git a/testdata/project-v4-with-plugins/dist/chart/values.yaml b/testdata/project-v4-with-plugins/dist/chart/values.yaml
@@ -33,6 +33,11 @@ manager:
         fieldRef:
             fieldPath: metadata.namespace
 
+  ## Env overrides (--set manager.envOverrides.VAR=value)
+  ## Same name in env above: this value takes precedence.
+  ##
+  envOverrides: {}
+
   ## Image pull secrets
   ##
   imagePullSecrets: []
