Skip to content

Commit 3e073b8

Browse files
NeonSludgeNeonSludge
committed
[bitnami/airflow] Allow customizing the empty-dir volume parameters
Signed-off-by: Kirill Buev <[email protected]>
1 parent 2012e46 commit 3e073b8

File tree

12 files changed

+924
-443
lines changed

12 files changed

+924
-443
lines changed

‎bitnami/airflow/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ maintainers:
4141
name: airflow
4242
sources:
4343
- https://github.com/bitnami/charts/tree/main/bitnami/airflow
44-
version: 25.0.4
44+
version: 25.1.0

‎bitnami/airflow/README.md‎

Lines changed: 484 additions & 442 deletions
Large diffs are not rendered by default.

‎bitnami/airflow/templates/_init_containers_sidecars.tpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ Returns an init-container that waits for db migrations to be ready
260260
- name: empty-dir
261261
mountPath: /opt/bitnami/airflow/airflow.cfg
262262
subPath: app-base-dir/airflow.cfg
263+
- name: empty-dir
264+
mountPath: /opt/bitnami/airflow/config/airflow_local_settings.py
265+
subPath: app-conf-dir/airflow_local_settings.py
263266
{{- if .Values.extraVolumeMounts }}
264267
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 4 }}
265268
{{- end }}

‎bitnami/airflow/templates/config/configmap-pod-template.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ data:
200200
- name: empty-dir
201201
mountPath: /opt/bitnami/airflow/airflow.cfg
202202
subPath: app-base-dir/airflow.cfg
203+
- name: empty-dir
204+
mountPath: /opt/bitnami/airflow/config/airflow_local_settings.py
205+
subPath: app-conf-dir/airflow_local_settings.py
203206
- name: empty-dir
204207
mountPath: /opt/bitnami/airflow/webserver_config.py
205208
subPath: app-base-dir/webserver_config.py
@@ -235,7 +238,34 @@ data:
235238
{{- end }}
236239
volumes:
237240
- name: empty-dir
241+
{{- if .Values.worker.emptyDir.ephemeral.enabled }}
242+
ephemeral:
243+
volumeClaimTemplate:
244+
{{- if or .Values.worker.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
245+
metadata:
246+
{{- if or .Values.worker.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
247+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.worker.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
248+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
249+
{{- end }}
250+
{{- if .Values.commonLabels }}
251+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
252+
{{- end }}
253+
{{- end }}
254+
spec:
255+
accessModes:
256+
{{- range .Values.worker.emptyDir.ephemeral.accessModes }}
257+
- {{ . | quote }}
258+
{{- end }}
259+
resources:
260+
requests:
261+
storage: {{ .Values.worker.emptyDir.ephemeral.size | quote }}
262+
{{- include "common.storage.class" (dict "persistence" .Values.worker.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
263+
{{- else if .Values.worker.emptyDir.medium }}
264+
emptyDir:
265+
medium: {{ .Values.worker.emptyDir.medium }}
266+
{{- else }}
238267
emptyDir: {}
268+
{{- end }}
239269
- name: configuration
240270
configMap:
241271
name: {{ include "airflow.configMapName" . }}

‎bitnami/airflow/templates/dag-processor/deployment.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,34 @@ spec:
255255
{{- end }}
256256
volumes:
257257
- name: empty-dir
258+
{{- if .Values.dagProcessor.emptyDir.ephemeral.enabled }}
259+
ephemeral:
260+
volumeClaimTemplate:
261+
{{- if or .Values.dagProcessor.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
262+
metadata:
263+
{{- if or .Values.dagProcessor.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
264+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.dagProcessor.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
265+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
266+
{{- end }}
267+
{{- if .Values.commonLabels }}
268+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
269+
{{- end }}
270+
{{- end }}
271+
spec:
272+
accessModes:
273+
{{- range .Values.dagProcessor.emptyDir.ephemeral.accessModes }}
274+
- {{ . | quote }}
275+
{{- end }}
276+
resources:
277+
requests:
278+
storage: {{ .Values.dagProcessor.emptyDir.ephemeral.size | quote }}
279+
{{- include "common.storage.class" (dict "persistence" .Values.dagProcessor.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
280+
{{- else if .Values.dagProcessor.emptyDir.medium }}
281+
emptyDir:
282+
medium: {{ .Values.dagProcessor.emptyDir.medium }}
283+
{{- else }}
258284
emptyDir: {}
285+
{{- end }}
259286
- name: configuration
260287
configMap:
261288
name: {{ include "airflow.configMapName" . }}

‎bitnami/airflow/templates/metrics/deployment.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,34 @@ spec:
133133
{{- end }}
134134
volumes:
135135
- name: empty-dir
136+
{{- if .Values.metrics.emptyDir.ephemeral.enabled }}
137+
ephemeral:
138+
volumeClaimTemplate:
139+
{{- if or .Values.metrics.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
140+
metadata:
141+
{{- if or .Values.metrics.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
142+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.metrics.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
143+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
144+
{{- end }}
145+
{{- if .Values.commonLabels }}
146+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
147+
{{- end }}
148+
{{- end }}
149+
spec:
150+
accessModes:
151+
{{- range .Values.metrics.emptyDir.ephemeral.accessModes }}
152+
- {{ . | quote }}
153+
{{- end }}
154+
resources:
155+
requests:
156+
storage: {{ .Values.metrics.emptyDir.ephemeral.size | quote }}
157+
{{- include "common.storage.class" (dict "persistence" .Values.metrics.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
158+
{{- else if .Values.metrics.emptyDir.medium }}
159+
emptyDir:
160+
medium: {{ .Values.metrics.emptyDir.medium }}
161+
{{- else }}
136162
emptyDir: {}
163+
{{- end }}
137164
- name: configuration
138165
configMap:
139166
name: {{ include "airflow.metrics.configMapName" . }}

‎bitnami/airflow/templates/scheduler/deployment.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,34 @@ spec:
276276
{{- end }}
277277
volumes:
278278
- name: empty-dir
279+
{{- if .Values.scheduler.emptyDir.ephemeral.enabled }}
280+
ephemeral:
281+
volumeClaimTemplate:
282+
{{- if or .Values.scheduler.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
283+
metadata:
284+
{{- if or .Values.scheduler.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
285+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.scheduler.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
286+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
287+
{{- end }}
288+
{{- if .Values.commonLabels }}
289+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
290+
{{- end }}
291+
{{- end }}
292+
spec:
293+
accessModes:
294+
{{- range .Values.scheduler.emptyDir.ephemeral.accessModes }}
295+
- {{ . | quote }}
296+
{{- end }}
297+
resources:
298+
requests:
299+
storage: {{ .Values.scheduler.emptyDir.ephemeral.size | quote }}
300+
{{- include "common.storage.class" (dict "persistence" .Values.scheduler.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
301+
{{- else if .Values.scheduler.emptyDir.medium }}
302+
emptyDir:
303+
medium: {{ .Values.scheduler.emptyDir.medium }}
304+
{{- else }}
279305
emptyDir: {}
306+
{{- end }}
280307
- name: configuration
281308
configMap:
282309
name: {{ include "airflow.configMapName" . }}

‎bitnami/airflow/templates/setup-db-job.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,34 @@ spec:
175175
{{- end }}
176176
volumes:
177177
- name: empty-dir
178+
{{- if .Values.setupDBJob.emptyDir.ephemeral.enabled }}
179+
ephemeral:
180+
volumeClaimTemplate:
181+
{{- if or .Values.setupDBJob.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
182+
metadata:
183+
{{- if or .Values.setupDBJob.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
184+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.setupDBJob.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
185+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
186+
{{- end }}
187+
{{- if .Values.commonLabels }}
188+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
189+
{{- end }}
190+
{{- end }}
191+
spec:
192+
accessModes:
193+
{{- range .Values.setupDBJob.emptyDir.ephemeral.accessModes }}
194+
- {{ . | quote }}
195+
{{- end }}
196+
resources:
197+
requests:
198+
storage: {{ .Values.setupDBJob.emptyDir.ephemeral.size | quote }}
199+
{{- include "common.storage.class" (dict "persistence" .Values.setupDBJob.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
200+
{{- else if .Values.setupDBJob.emptyDir.medium }}
201+
emptyDir:
202+
medium: {{ .Values.setupDBJob.emptyDir.medium }}
203+
{{- else }}
178204
emptyDir: {}
205+
{{- end }}
179206
- name: configuration
180207
configMap:
181208
name: {{ include "airflow.configMapName" . }}

‎bitnami/airflow/templates/triggerer/statefulset.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,34 @@ spec:
273273
{{- end }}
274274
volumes:
275275
- name: empty-dir
276+
{{- if .Values.triggerer.emptyDir.ephemeral.enabled }}
277+
ephemeral:
278+
volumeClaimTemplate:
279+
{{- if or .Values.triggerer.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
280+
metadata:
281+
{{- if or .Values.triggerer.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
282+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.triggerer.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
283+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
284+
{{- end }}
285+
{{- if .Values.commonLabels }}
286+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
287+
{{- end }}
288+
{{- end }}
289+
spec:
290+
accessModes:
291+
{{- range .Values.triggerer.emptyDir.ephemeral.accessModes }}
292+
- {{ . | quote }}
293+
{{- end }}
294+
resources:
295+
requests:
296+
storage: {{ .Values.triggerer.emptyDir.ephemeral.size | quote }}
297+
{{- include "common.storage.class" (dict "persistence" .Values.triggerer.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
298+
{{- else if .Values.triggerer.emptyDir.medium }}
299+
emptyDir:
300+
medium: {{ .Values.triggerer.emptyDir.medium }}
301+
{{- else }}
276302
emptyDir: {}
303+
{{- end }}
277304
- name: configuration
278305
configMap:
279306
name: {{ include "airflow.configMapName" . }}

‎bitnami/airflow/templates/web/deployment.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,34 @@ spec:
295295
{{- end }}
296296
volumes:
297297
- name: empty-dir
298+
{{- if .Values.web.emptyDir.ephemeral.enabled }}
299+
ephemeral:
300+
volumeClaimTemplate:
301+
{{- if or .Values.web.emptyDir.ephemeral.annotations .Values.commonAnnotations .Values.commonLabels }}
302+
metadata:
303+
{{- if or .Values.web.emptyDir.ephemeral.annotations .Values.commonAnnotations }}
304+
{{- $claimAnnotations := include "common.tplvalues.merge" (dict "values" .Values.web.emptyDir.ephemeral.annotations .Values.commonAnnotations "context" .) | fromYaml }}
305+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $ ) | nindent 18 }}
306+
{{- end }}
307+
{{- if .Values.commonLabels }}
308+
labels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 18 }}
309+
{{- end }}
310+
{{- end }}
311+
spec:
312+
accessModes:
313+
{{- range .Values.web.emptyDir.ephemeral.accessModes }}
314+
- {{ . | quote }}
315+
{{- end }}
316+
resources:
317+
requests:
318+
storage: {{ .Values.web.emptyDir.ephemeral.size | quote }}
319+
{{- include "common.storage.class" (dict "persistence" .Values.web.emptyDir.ephemeral "global" .Values.global) | nindent 16 }}
320+
{{- else if .Values.web.emptyDir.medium }}
321+
emptyDir:
322+
medium: {{ .Values.web.emptyDir.medium }}
323+
{{- else }}
298324
emptyDir: {}
325+
{{- end }}
299326
- name: configuration
300327
configMap:
301328
name: {{ include "airflow.configMapName" . }}

0 commit comments

Comments
 (0)