Merge pull request #4371 from monteiro-renato/patch-6

🐛 fix: (helm/v1alpha1): env config should not be dependent on DeployImages
kubernetes-sigs · Nov 22, 2024 · e912c51 · e912c51
2 parents 9bb9b91 + 66d5f86
commit e912c51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go b/...ins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go
@@ -85,13 +85,13 @@ spec:
           command:
             - /manager
           image: {{ "{{ .Values.controllerManager.container.image.repository }}" }}:{{ "{{ .Values.controllerManager.container.image.tag }}" }}
-{{- if .DeployImages }}
+          {{ "{{- if .Values.controllerManager.container.env }}" }}
           env:
             {{ "{{- range $key, $value := .Values.controllerManager.container.env }}" }}
             - name: {{ "{{ $key }}" }}
               value: {{ "{{ $value }}" }}
             {{ "{{- end }}" }}
-{{- end }}
+          {{ "{{- end }}" }}
           livenessProbe:
             {{ "{{- toYaml .Values.controllerManager.container.livenessProbe | nindent 12 }}" }}
           readinessProbe:

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
@@ -29,11 +29,13 @@ spec:
           command:
             - /manager
           image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }}
+          {{- if .Values.controllerManager.container.env }}
           env:
             {{- range $key, $value := .Values.controllerManager.container.env }}
             - name: {{ $key }}
               value: {{ $value }}
             {{- end }}
+          {{- end }}
           livenessProbe:
             {{- toYaml .Values.controllerManager.container.livenessProbe | nindent 12 }}
           readinessProbe: