From 97c17a8f04c0f3b9c385f194cfda6a36fb3d722b Mon Sep 17 00:00:00 2001 From: Will Gan Date: Tue, 7 Sep 2021 14:10:02 -0700 Subject: [PATCH 1/5] Add env variables for supersetNode in Helm template --- helm/superset/templates/deployment.yaml | 6 ++++++ helm/superset/values.yaml | 1 + 2 files changed, 7 insertions(+) diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index 919078299525f..f39f33471b8b1 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -79,6 +79,12 @@ spec: value: {{ $value | quote }} {{- end }} {{- end }} + {{- if .Values.supersetNode.env }} + {{- range $key, $value := .Values.extraEnv }} + - name: {{ $key | quote}} + value: {{ $value | quote }} + {{- end }} + {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index c6ad3e10ff33a..4657c4f4d1012 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -182,6 +182,7 @@ supersetNode: db_user: superset db_pass: superset db_name: superset + env: {} forceReload: false # If true, forces deployment to reload on each upgrade initContainers: - name: wait-for-postgres From 2818781c14c5c8d90a78255468863ffe1f591cbf Mon Sep 17 00:00:00 2001 From: Will Gan Date: Tue, 7 Sep 2021 14:35:29 -0700 Subject: [PATCH 2/5] Typo in template --- helm/superset/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index f39f33471b8b1..f24f2268823db 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: {{- end }} {{- end }} {{- if .Values.supersetNode.env }} - {{- range $key, $value := .Values.extraEnv }} + {{- range $key, $value := .Values.supersetNode.env }} - name: {{ $key | quote}} value: {{ $value | quote }} {{- end }} From af83568fb875faee95561e6f6e4c782727b0c97d Mon Sep 17 00:00:00 2001 From: Will Gan Date: Fri, 17 Sep 2021 11:09:56 -0700 Subject: [PATCH 3/5] Removed unnecessary if --- helm/superset/templates/deployment.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index f24f2268823db..8a6bac31174e2 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -73,18 +73,14 @@ spec: env: - name: "SUPERSET_PORT" value: {{ .Values.service.port | quote}} - {{- if .Values.extraEnv }} {{- range $key, $value := .Values.extraEnv }} - name: {{ $key | quote}} value: {{ $value | quote }} {{- end }} - {{- end }} - {{- if .Values.supersetNode.env }} {{- range $key, $value := .Values.supersetNode.env }} - name: {{ $key | quote}} value: {{ $value | quote }} {{- end }} - {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} From 74e2c22902819a7a766625a927497b87ff336a66 Mon Sep 17 00:00:00 2001 From: Will Gan Date: Fri, 17 Sep 2021 11:24:38 -0700 Subject: [PATCH 4/5] Revert "Removed unnecessary if" This reverts commit af83568fb875faee95561e6f6e4c782727b0c97d. --- helm/superset/templates/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index 8a6bac31174e2..f24f2268823db 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -73,14 +73,18 @@ spec: env: - name: "SUPERSET_PORT" value: {{ .Values.service.port | quote}} + {{- if .Values.extraEnv }} {{- range $key, $value := .Values.extraEnv }} - name: {{ $key | quote}} value: {{ $value | quote }} {{- end }} + {{- end }} + {{- if .Values.supersetNode.env }} {{- range $key, $value := .Values.supersetNode.env }} - name: {{ $key | quote}} value: {{ $value | quote }} {{- end }} + {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} From 7aa8a39189065de0cfed53287825c877f87d1272 Mon Sep 17 00:00:00 2001 From: Will Gan Date: Fri, 17 Sep 2021 11:27:42 -0700 Subject: [PATCH 5/5] Bumping chart version to 0.3.8 --- helm/superset/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index 8f39c30543620..c1a7ca7478f7c 100644 --- a/helm/superset/Chart.yaml +++ b/helm/superset/Chart.yaml @@ -22,7 +22,7 @@ maintainers: - name: craig-rueda email: craig@craigrueda.com url: https://github.com/craig-rueda -version: 0.3.5 +version: 0.3.8 dependencies: - name: postgresql version: 10.2.0