diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index 1b84fcac6..e3c6f4bb5 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.9 +version: 0.3.10 dependencies: - name: postgresql version: 10.2.0 diff --git a/helm/superset/templates/deployment-beat.yaml b/helm/superset/templates/deployment-beat.yaml index fce5162df..512a7a254 100644 --- a/helm/superset/templates/deployment-beat.yaml +++ b/helm/superset/templates/deployment-beat.yaml @@ -72,12 +72,13 @@ 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.extraEnvRaw }} + {{- toYaml .Values.extraEnvRaw | nindent 12 }} + {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml index c458e10e4..9ada4352b 100644 --- a/helm/superset/templates/deployment-worker.yaml +++ b/helm/superset/templates/deployment-worker.yaml @@ -73,12 +73,13 @@ 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.extraEnvRaw }} + {{- toYaml .Values.extraEnvRaw | nindent 12 }} + {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index 63ca5d712..4040d0a51 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -76,18 +76,17 @@ 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 }} + {{- if .Values.extraEnvRaw }} + {{- toYaml .Values.extraEnvRaw | nindent 12 }} + {{- end }} envFrom: - secretRef: name: {{ tpl .Values.envFromSecret . | quote }} diff --git a/helm/superset/templates/init-job.yaml b/helm/superset/templates/init-job.yaml index fb30abc8c..b1a4e3e62 100644 --- a/helm/superset/templates/init-job.yaml +++ b/helm/superset/templates/init-job.yaml @@ -36,12 +36,15 @@ spec: containers: - name: {{ template "superset.name" . }}-init-db image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{ if .Values.extraEnv }} + {{- if or .Values.extraEnv .Values.extraEnvRaw }} env: {{- range $key, $value := .Values.extraEnv }} - name: {{ $key | quote }} value: {{ $value | quote }} {{- end }} + {{- if .Values.extraEnvRaw }} + {{- toYaml .Values.extraEnvRaw | nindent 10 }} + {{- end }} {{- end }} envFrom: - secretRef: diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index ea9fa076a..a9b9e1558 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -54,11 +54,21 @@ extraEnv: {} # GUNICORN_TIMEOUT: 300 - # OAUTH_HOME_DOMAIN: .. + # OAUTH_HOME_DOMAIN: .. # # If a whitelist is not set, any address that can use your OAuth2 endpoint will be able to login. # # this includes any random Gmail address if your OAuth2 Web App is set to External. # OAUTH_WHITELIST_REGEX: ... +## Extra environment variables in RAW format that will be passed into pods +## +extraEnvRaw: [] + # Load DB password from other secret (e.g. for zalando operator) + # - name: DB_PASS + # valueFrom: + # secretKeyRef: + # name: superset.superset-postgres.credentials.postgresql.acid.zalan.do + # key: password + ## Extra environment variables to pass as secrets ## extraSecretEnv: {}