Skip to content

Commit 66d5f86

Browse files
🐛 fix: (helm/v1alpha1): env config should not be dependent on DeployImages
1 parent 70fd17d commit 66d5f86

File tree

2 files changed

+4
-2
lines changed
  • pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager
  • testdata/project-v4-with-plugins/dist/chart/templates/manager

2 files changed

+4
-2
lines changed

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ spec:
8484
command:
8585
- /manager
8686
image: {{ "{{ .Values.controllerManager.container.image.repository }}" }}:{{ "{{ .Values.controllerManager.container.image.tag }}" }}
87-
{{- if .DeployImages }}
87+
{{ "{{- if .Values.controllerManager.container.env }}" }}
8888
env:
8989
{{ "{{- range $key, $value := .Values.controllerManager.container.env }}" }}
9090
- name: {{ "{{ $key }}" }}
9191
value: {{ "{{ $value }}" }}
9292
{{ "{{- end }}" }}
93-
{{- end }}
93+
{{ "{{- end }}" }}
9494
livenessProbe:
9595
{{ "{{- toYaml .Values.controllerManager.container.livenessProbe | nindent 12 }}" }}
9696
readinessProbe:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ spec:
2828
command:
2929
- /manager
3030
image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }}
31+
{{- if .Values.controllerManager.container.env }}
3132
env:
3233
{{- range $key, $value := .Values.controllerManager.container.env }}
3334
- name: {{ $key }}
3435
value: {{ $value }}
3536
{{- end }}
37+
{{- end }}
3638
livenessProbe:
3739
{{- toYaml .Values.controllerManager.container.livenessProbe | nindent 12 }}
3840
readinessProbe:

0 commit comments

Comments
 (0)