dd

Author: camilamacedo86

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml

@@ -27,7 +27,7 @@ spec:
                     - --metrics-bind-address=:8443
                     {{- else }}
                     # Bind to :0 to disable the controller-runtime managed metrics server
-                    - --metrics-bind-address=:0
+                    - --metrics-bind-address=0
                     {{- end }}
                     - --health-probe-bind-address=:8081
                     {{- range .Values.controllerManager.args }}

docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml

@@ -27,7 +27,7 @@ spec:
                     - --metrics-bind-address=:8443
                     {{- else }}
                     # Bind to :0 to disable the controller-runtime managed metrics server
-                    - --metrics-bind-address=:0
+                    - --metrics-bind-address=0
                     {{- end }}
                     - --health-probe-bind-address=:8081
                     {{- range .Values.controllerManager.args }}

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml

@@ -27,7 +27,7 @@ spec:
                     - --metrics-bind-address=:8443
                     {{- else }}
                     # Bind to :0 to disable the controller-runtime managed metrics server
-                    - --metrics-bind-address=:0
+                    - --metrics-bind-address=0
                     {{- end }}
                     - --health-probe-bind-address=:8081
                     {{- range .Values.controllerManager.args }}

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/chart_converter.go

@@ -229,7 +229,7 @@ func extractContainerArgs(container map[string]interface{}, config map[string]in
 		}
 
 		// The following arguments should not be exposed under args
-		// manager because they are not alone customizable
+		// manager because they are not independently customizable
 		if strings.Contains(strArg, "--metrics-bind-address") ||
 			strings.Contains(strArg, "--health-probe-bind-address") ||
 			strings.Contains(strArg, "--webhook-cert-path") ||

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater.go

@@ -485,7 +485,7 @@ func (t *HelmTemplater) templateContainerSecurityContext(yamlContent string) str
 }
 
 func leadingWhitespace(line string) (string, int) {
-	trimmed := strings.TrimLeft(line, " 	")
+	trimmed := strings.TrimLeft(line, " \t")
 	indentLen := len(line) - len(trimmed)
 	return line[:indentLen], indentLen
 }
@@ -565,7 +565,7 @@ func (t *HelmTemplater) templateControllerManagerArgs(yamlContent string) string
 		builder.WriteString(metricsIndent)
 		builder.WriteString("# Bind to :0 to disable the controller-runtime managed metrics server\n")
 		builder.WriteString(metricsIndent)
-		builder.WriteString("- --metrics-bind-address=:0\n")
+		builder.WriteString("- --metrics-bind-address=0\n")
 		builder.WriteString(metricsIndent)
 		builder.WriteString("{{- end }}\n")
 	}

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater_test.go

@@ -145,7 +145,7 @@ spec:
 
 			Expect(result).To(ContainSubstring("{{- if .Values.metrics.enable }}"))
 			Expect(result).To(ContainSubstring("- --metrics-bind-address=:8443"))
-			Expect(result).To(ContainSubstring("- --metrics-bind-address=:0"))
+			Expect(result).To(ContainSubstring("- --metrics-bind-address=0"))
 			Expect(result).To(ContainSubstring("- --health-probe-bind-address=:8081"))
 			Expect(result).To(ContainSubstring("{{- range .Values.controllerManager.args }}"))
 			Expect(result).NotTo(ContainSubstring("BUSYBOX_IMAGE"))

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go

@@ -51,6 +51,7 @@ var _ = Describe("HelmValuesBasic", func() {
 
 			Expect(content).To(ContainSubstring("controllerManager:"))
 			Expect(content).To(ContainSubstring("args: []"))
+			Expect(content).To(ContainSubstring("env: []"))
 			Expect(content).To(ContainSubstring("metrics:"))
 			Expect(content).To(ContainSubstring("prometheus:"))
 			Expect(content).To(ContainSubstring("rbacHelpers:"))
@@ -149,13 +150,50 @@ var _ = Describe("HelmValuesBasic", func() {
 			content := valuesTemplate.GetBody()
 			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("repository: example.com/custom-controller"))
 			Expect(content).To(ContainSubstring("tag: v1.2.3"))
 			Expect(content).To(ContainSubstring("pullPolicy: Always"))
+			Expect(content).To(ContainSubstring("resources:"))
+			Expect(content).To(ContainSubstring("cpu: 100m"))
+			Expect(content).To(ContainSubstring("memory: 128Mi"))
 			Expect(content).To(ContainSubstring("manager:"))
 		})
 	})
 
+	Context("with complex env variables", func() {
+		BeforeEach(func() {
+			valuesTemplate = &HelmValuesBasic{
+				DeploymentConfig: map[string]interface{}{
+					"env": []interface{}{
+						map[string]interface{}{
+							"name": "POD_NAMESPACE",
+							"valueFrom": map[string]interface{}{
+								"fieldRef": map[string]interface{}{
+									"fieldPath": "metadata.namespace",
+								},
+							},
+						},
+					},
+				},
+			}
+			valuesTemplate.InjectProjectName("test-project")
+			err := valuesTemplate.SetTemplateDefaults()
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		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("valueFrom:"))
+			Expect(content).To(ContainSubstring("fieldRef:"))
+			Expect(content).To(ContainSubstring("fieldPath: metadata.namespace"))
+		})
+	})
+
 	Context("rbacHelpers configuration", func() {
 		BeforeEach(func() {
 			valuesTemplate = &HelmValuesBasic{

testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml

@@ -27,7 +27,7 @@ spec:
                     - --metrics-bind-address=:8443
                     {{- else }}
                     # Bind to :0 to disable the controller-runtime managed metrics server
-                    - --metrics-bind-address=:0
+                    - --metrics-bind-address=0
                     {{- end }}
                     - --health-probe-bind-address=:8081
                     {{- range .Values.controllerManager.args }}