add tests and make generate-charts

Author: zarcen

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

@@ -14,6 +14,9 @@ manager:
   # Environment variables
   env: []
 
+  # Image pull secrets
+  imagePullSecrets: []
+
   # Pod-level security settings
   podSecurityContext:
     runAsNonRoot: true

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

@@ -14,6 +14,9 @@ manager:
   # Environment variables
   env: []
 
+  # Image pull secrets
+  imagePullSecrets: []
+
   # Pod-level security settings
   podSecurityContext:
     runAsNonRoot: true

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

@@ -14,6 +14,9 @@ manager:
   # Environment variables
   env: []
 
+  # Image pull secrets
+  imagePullSecrets: []
+
   # Pod-level security settings
   podSecurityContext:
     runAsNonRoot: true

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

@@ -105,7 +105,7 @@ func (c *ChartConverter) ExtractDeploymentConfig() map[string]interface{} {
 	}
 
 	extractPodSecurityContext(specMap, config)
-	extractPodImagePullSecrets(specMap, config)
+	extractImagePullSecrets(specMap, config)
 	container := firstManagerContainer(specMap)
 	if container == nil {
 		return config
@@ -135,7 +135,7 @@ func extractDeploymentSpec(deployment *unstructured.Unstructured) map[string]int
 	return specMap
 }
 
-func extractPodImagePullSecrets(specMap map[string]interface{}, config map[string]interface{}) {
+func extractImagePullSecrets(specMap map[string]interface{}, config map[string]interface{}) {
 	imagePullSecrets, found, err := unstructured.NestedFieldNoCopy(specMap, "imagePullSecrets")
 	if !found || err != nil {
 		return

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

@@ -274,7 +274,7 @@ var _ = Describe("ChartConverter", func() {
 			Expect(config["webhookPort"]).To(Equal(9444))
 		})
 
-		It("should extract image pull secrets", func() {
+		It("should extract imagePullSecrets", func() {
 			// Set up deployment with image pull secrets
 			containers := []interface{}{
 				map[string]interface{}{

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

@@ -334,7 +334,8 @@ func (t *HelmTemplater) templateImagePullSecrets(yamlContent string) string {
 
 	lines := strings.Split(yamlContent, "\n")
 	for i := 0; i < len(lines); i++ {
-		if strings.TrimSpace(lines[i]) != "imagePullSecrets:" {
+		// Use prefix to allow `imagePullSecrets: []` to be preserved
+		if !strings.HasPrefix(strings.TrimSpace(lines[i]), "imagePullSecrets:") {
 			continue
 		}
 		indentStr, indentLen := leadingWhitespace(lines[i])
@@ -345,13 +346,12 @@ func (t *HelmTemplater) templateImagePullSecrets(yamlContent string) string {
 				break
 			}
 			lineIndent := len(lines[end]) - len(strings.TrimLeft(lines[end], " \t"))
-			if lineIndent <= indentLen {
+			if lineIndent < indentLen {
+				break
+			}
+			if lineIndent == indentLen && !strings.HasPrefix(trimmed, "-") {
 				break
 			}
-		}
-
-		if end >= len(lines) {
-			break
 		}
 
 		if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.manager.imagePullSecrets") {

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

@@ -230,6 +230,58 @@ metadata:
 			Expect(result).NotTo(ContainSubstring(`{{- include "chart.labels"`))
 			Expect(result).NotTo(ContainSubstring(`{{- include "chart.annotations"`))
 		})
+
+		It("should template imagePullSecrets", func() {
+			deploymentResource := &unstructured.Unstructured{}
+			deploymentResource.SetAPIVersion("apps/v1")
+			deploymentResource.SetKind("Deployment")
+			deploymentResource.SetName("test-project-controller-manager")
+
+			content := `apiVersion: apps/v1
+kind: Deployment
+spec:
+  template:
+    spec:
+      imagePullSecrets:
+      - name: test-secret
+      containers:
+      - args:
+        - --metrics-bind-address=:8443
+        - --health-probe-bind-address=:8081
+        - --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs/tls.crt
+        - --metrics-cert-path=/tmp/k8s-metrics-server/metrics-certs/tls.crt
+        - --leader-elect`
+
+			result := templater.ApplyHelmSubstitutions(content, deploymentResource)
+
+			Expect(result).To(ContainSubstring("imagePullSecrets:"))
+			Expect(result).NotTo(ContainSubstring("test-secret"))
+		})
+
+		It("should template empty imagePullSecrets", func() {
+			deploymentResource := &unstructured.Unstructured{}
+			deploymentResource.SetAPIVersion("apps/v1")
+			deploymentResource.SetKind("Deployment")
+			deploymentResource.SetName("test-project-controller-manager")
+
+			content := `apiVersion: apps/v1
+kind: Deployment
+spec:
+  template:
+    spec:
+      imagePullSecrets: []
+      containers:
+      - args:
+        - --metrics-bind-address=:8443
+        - --health-probe-bind-address=:8081
+        - --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs/tls.crt
+        - --metrics-cert-path=/tmp/k8s-metrics-server/metrics-certs/tls.crt
+        - --leader-elect`
+
+			result := templater.ApplyHelmSubstitutions(content, deploymentResource)
+
+			Expect(result).To(ContainSubstring("imagePullSecrets:"))
+		})
 	})
 
 	Context("conditional wrapping", func() {

testdata/project-v4-with-plugins/config/manager/manager.yaml

@@ -57,6 +57,7 @@ spec:
         runAsNonRoot: true
         seccompProfile:
           type: RuntimeDefault
+      imagePullSecrets: []
       containers:
       - command:
         - /manager

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

@@ -81,6 +81,10 @@ spec:
                       name: webhook-certs
                       readOnly: true
                     {{- end }}
+            {{- if .Values.manager.imagePullSecrets }}
+            imagePullSecrets:
+              {{- toYaml .Values.manager.imagePullSecrets | nindent 14 }}
+            {{- end }}
             securityContext:
               {{- if .Values.manager.podSecurityContext }}
               {{- toYaml .Values.manager.podSecurityContext | nindent 14 }}

testdata/project-v4-with-plugins/dist/install.yaml

@@ -1026,6 +1026,7 @@ spec:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: webhook-certs
           readOnly: true
+      imagePullSecrets: []
       securityContext:
         runAsNonRoot: true
         seccompProfile: