From 232c2400e3b70f0f1460fd21fe48e4b7849b73f7 Mon Sep 17 00:00:00 2001
From: ddl-ebrown <ethan.brown@dominodatalab.com>
Date: Wed, 31 Jan 2024 15:24:06 -0800
Subject: [PATCH] Flyte-core chart prevent empty env:

 - Some linters consider empty env: as invalid k8s YAML, because env is
   typically an [] when no values are set

   Prevent rendering the console env block without values

Signed-off-by: ddl-ebrown <ethan.brown@dominodatalab.com>
---
 charts/flyte-core/templates/console/deployment.yaml    | 2 ++
 deployment/eks/flyte_aws_scheduler_helm_generated.yaml | 1 -
 deployment/eks/flyte_helm_controlplane_generated.yaml  | 1 -
 deployment/eks/flyte_helm_generated.yaml               | 1 -
 deployment/gcp/flyte_helm_controlplane_generated.yaml  | 1 -
 deployment/gcp/flyte_helm_generated.yaml               | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/charts/flyte-core/templates/console/deployment.yaml b/charts/flyte-core/templates/console/deployment.yaml
index 09c9e741c8..517dda57f9 100644
--- a/charts/flyte-core/templates/console/deployment.yaml
+++ b/charts/flyte-core/templates/console/deployment.yaml
@@ -33,7 +33,9 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
+        {{- if or .Values.flyteconsole.ga.enabled .Values.flyteconsole.podEnv }}
         env:
+        {{- end }}
         {{- if .Values.flyteconsole.ga.enabled }}
         - name: ENABLE_GA
           value: "{{ .Values.flyteconsole.ga.enabled }}"
diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
index c4f557836a..dc36f3b286 100644
--- a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
+++ b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -1096,7 +1096,6 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
-        env:
         resources: 
           limits:
             cpu: 250m
diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
index 47a75cae25..edeabf6303 100644
--- a/deployment/eks/flyte_helm_controlplane_generated.yaml
+++ b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -802,7 +802,6 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
-        env:
         resources: 
           limits:
             cpu: 250m
diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
index 910b2746b8..81abf2f5aa 100644
--- a/deployment/eks/flyte_helm_generated.yaml
+++ b/deployment/eks/flyte_helm_generated.yaml
@@ -1127,7 +1127,6 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
-        env:
         resources: 
           limits:
             cpu: 250m
diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
index a31446875c..518ac4fb44 100644
--- a/deployment/gcp/flyte_helm_controlplane_generated.yaml
+++ b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -817,7 +817,6 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
-        env:
         resources: 
           limits:
             cpu: 250m
diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
index 0627ba986c..d72ed9daf8 100644
--- a/deployment/gcp/flyte_helm_generated.yaml
+++ b/deployment/gcp/flyte_helm_generated.yaml
@@ -1150,7 +1150,6 @@ spec:
             name: flyte-console-config
         ports:
         - containerPort: 8080
-        env:
         resources: 
           limits:
             cpu: 250m