feat: Add extraVolumes and extraVolumeMounts to all main containers (#16361)
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 8f39c30..30a409e 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -22,7 +22,7 @@
- name: craig-rueda
email: craig@craigrueda.com
url: https://github.com/craig-rueda
-version: 0.3.5
+version: 0.3.6
dependencies:
- name: postgresql
version: 10.2.0
diff --git a/helm/superset/templates/deployment-beat.yaml b/helm/superset/templates/deployment-beat.yaml
index e5705fa..2775d28 100644
--- a/helm/superset/templates/deployment-beat.yaml
+++ b/helm/superset/templates/deployment-beat.yaml
@@ -86,6 +86,9 @@
- name: superset-config
mountPath: {{ .Values.configMountPath | quote }}
readOnly: true
+ {{- with .Values.extraVolumeMounts }}
+ {{- tpl (toYaml .) $ | nindent 12 -}}
+ {{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
@@ -108,4 +111,7 @@
- name: superset-config
secret:
secretName: {{ tpl .Values.configFromSecret . }}
+ {{- with .Values.extraVolumes }}
+ {{- tpl (toYaml .) $ | nindent 8 -}}
+ {{- end }}
{{- end -}}
diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml
index c228b35..8bb2cc8 100644
--- a/helm/superset/templates/deployment-worker.yaml
+++ b/helm/superset/templates/deployment-worker.yaml
@@ -87,6 +87,9 @@
- name: superset-config
mountPath: {{ .Values.configMountPath | quote }}
readOnly: true
+ {{- with .Values.extraVolumeMounts }}
+ {{- tpl (toYaml .) $ | nindent 12 -}}
+ {{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
@@ -109,3 +112,6 @@
- name: superset-config
secret:
secretName: {{ tpl .Values.configFromSecret . }}
+ {{- with .Values.extraVolumes }}
+ {{- tpl (toYaml .) $ | nindent 8 -}}
+ {{- end }}
diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml
index 9190782..ec6b4f4 100644
--- a/helm/superset/templates/deployment.yaml
+++ b/helm/superset/templates/deployment.yaml
@@ -95,6 +95,9 @@
mountPath: {{ .Values.extraConfigMountPath | quote }}
readOnly: true
{{- end }}
+ {{- with .Values.extraVolumeMounts }}
+ {{- tpl (toYaml .) $ | nindent 12 -}}
+ {{- end }}
ports:
- name: http
containerPort: {{ .Values.service.port }}
@@ -127,3 +130,6 @@
configMap:
name: {{ template "superset.fullname" . }}-extra-config
{{- end }}
+ {{- with .Values.extraVolumes }}
+ {{- tpl (toYaml .) $ | nindent 8 -}}
+ {{- end }}
diff --git a/helm/superset/templates/init-job.yaml b/helm/superset/templates/init-job.yaml
index 45ab223..fb30abc 100644
--- a/helm/superset/templates/init-job.yaml
+++ b/helm/superset/templates/init-job.yaml
@@ -60,6 +60,9 @@
mountPath: {{ .Values.extraConfigMountPath | quote }}
readOnly: true
{{- end }}
+ {{- with .Values.extraVolumeMounts }}
+ {{- tpl (toYaml .) $ | nindent 10 -}}
+ {{- end }}
command: {{ tpl (toJson .Values.init.command) . }}
resources:
{{ toYaml .Values.init.resources | indent 10 }}
@@ -76,5 +79,8 @@
configMap:
name: {{ template "superset.fullname" . }}-extra-config
{{- end }}
+ {{- with .Values.extraVolumes }}
+ {{- tpl (toYaml .) $ | nindent 8 -}}
+ {{- end }}
restartPolicy: Never
{{- end }}
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index c6ad3e1..c857777 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -82,6 +82,22 @@
extraSecrets: {}
+extraVolumes: []
+ # - name: customConfig
+ # configMap:
+ # name: '{{ template "superset.fullname" . }}-custom-config'
+ # - name: additionalSecret
+ # secret:
+ # secretName: my-secret
+ # defaultMode: 0600
+
+extraVolumeMounts: []
+ # - name: customConfig
+ # mountPath: /mnt/config
+ # readOnly: true
+ # - name: additionalSecret:
+ # mountPath: /mnt/secret
+
# A dictionary of overrides to append at the end of superset_config.py - the name does not matter
# WARNING: the order is not guaranteed
configOverrides: {}
