From 66d5f863211c670b9f9b637b2eeefa893397460e Mon Sep 17 00:00:00 2001
From: Renato Monteiro <45536168+monteiro-renato@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:21:35 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20(helm/v1alpha1):=20env=20?=
 =?UTF-8?q?config=20should=20not=20be=20dependent=20on=20DeployImages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../internal/templates/chart-templates/manager/manager.go     | 4 ++--
 .../dist/chart/templates/manager/manager.yaml                 | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go
index 603ff8d39f6..bb494ce3d4b 100644
--- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go
+++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go
@@ -84,13 +84,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
index 7c72f4d8e58..4accc406ccd 100644
--- a/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml
+++ b/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml
@@ -28,11 +28,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: