Skip to content

Commit 65d850e

Browse files
mesetameseta
authored
add "Release" to template context dict (#121)
* add missing "Release" context where "airflow.volumes" is included Signed-off-by: Yuan Gao <[email protected]> * add "Release" context to other template usage Signed-off-by: Mathew Wicks <[email protected]>
1 parent dec1f10 commit 65d850e

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎charts/airflow/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
description: airflow is a platform to programmatically author, schedule, and monitor workflows
33
name: airflow
4-
version: 8.0.3
4+
version: 8.0.4
55
appVersion: 2.0.1
66
icon: https://airflow.apache.org/_images/pin_large.png
77
home: https://airflow.apache.org/

‎charts/airflow/files/pod_template.kubernetes-helm-yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ spec:
3333
{{- if or ($extraPipPackages) (.Values.dags.gitSync.enabled) }}
3434
initContainers:
3535
{{- if $extraPipPackages }}
36-
{{- include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) | indent 4 }}
36+
{{- include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) | indent 4 }}
3737
{{- end }}
38-
{{- include "airflow.container.git_sync" (dict "Values" .Values "sync_one_time" "true") | indent 4 }}
38+
{{- include "airflow.container.git_sync" (dict "Release" .Release "Values" .Values "sync_one_time" "true") | indent 4 }}
3939
{{- end }}
4040
containers:
4141
- name: base
@@ -56,13 +56,13 @@ spec:
5656
command: []
5757
args: []
5858
{{- $extraVolumeMounts := .Values.airflow.kubernetesPodTemplate.extraVolumeMounts }}
59-
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
59+
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
6060
{{- if $volumeMounts }}
6161
volumeMounts:
6262
{{- $volumeMounts | indent 8 }}
6363
{{- end }}
6464
{{- $extraVolumes := .Values.airflow.kubernetesPodTemplate.extraVolumes }}
65-
{{- $volumes := include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
65+
{{- $volumes := include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
6666
{{- if $volumes }}
6767
volumes:
6868
{{- $volumes | indent 4 }}

‎charts/airflow/templates/_helpers/pods.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Define an init-container which waits for DB migrations
5858

5959
{{/*
6060
Define an init-container which installs a list of pip packages
61-
EXAMPLE USAGE: {{ include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) }}
61+
EXAMPLE USAGE: {{ include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) }}
6262
*/}}
6363
{{- define "airflow.init_container.install_pip_packages" }}
6464
- name: install-pip-packages
@@ -81,7 +81,7 @@ EXAMPLE USAGE: {{ include "airflow.init_container.install_pip_packages" (dict "V
8181

8282
{{/*
8383
Define a container which regularly syncs a git-repo
84-
EXAMPLE USAGE: {{ include "airflow.container.git_sync" (dict "Values" .Values "sync_one_time" "true") }}
84+
EXAMPLE USAGE: {{ include "airflow.container.git_sync" (dict "Release" .Release "Values" .Values "sync_one_time" "true") }}
8585
*/}}
8686
{{- define "airflow.container.git_sync" }}
8787
- name: dags-git-sync
@@ -161,7 +161,7 @@ EXAMPLE USAGE: {{ include "airflow.container.git_sync" (dict "Values" .Values "s
161161

162162
{{/*
163163
The list of `volumeMounts` for web/scheduler/worker/flower container
164-
EXAMPLE USAGE: {{ include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
164+
EXAMPLE USAGE: {{ include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
165165
*/}}
166166
{{- define "airflow.volumeMounts" }}
167167
{{- /* dags */ -}}
@@ -200,7 +200,7 @@ EXAMPLE USAGE: {{ include "airflow.volumeMounts" (dict "Values" .Values "extraPi
200200

201201
{{/*
202202
The list of `volumes` for web/scheduler/worker/flower Pods
203-
EXAMPLE USAGE: {{ include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
203+
EXAMPLE USAGE: {{ include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
204204
*/}}
205205
{{- define "airflow.volumes" }}
206206
{{- /* dags */ -}}

‎charts/airflow/templates/flower/flower-deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
{{- end }}
7676
initContainers:
7777
{{- if $extraPipPackages }}
78-
{{- include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
78+
{{- include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
7979
{{- end }}
8080
{{- include "airflow.init_container.check_db" . | indent 8 }}
8181
{{- include "airflow.init_container.wait_for_db_migrations" . | indent 8 }}
@@ -151,13 +151,13 @@ spec:
151151
{{- end }}
152152
{{- end }}
153153
{{- $extraVolumeMounts := .Values.flower.extraVolumeMounts }}
154-
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
154+
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
155155
{{- if $volumeMounts }}
156156
volumeMounts:
157157
{{- $volumeMounts | indent 12 }}
158158
{{- end }}
159159
{{- $extraVolumes := .Values.flower.extraVolumes }}
160-
{{- $volumes := include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
160+
{{- $volumes := include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
161161
{{- if $volumes }}
162162
volumes:
163163
{{- $volumes | indent 8 }}

‎charts/airflow/templates/scheduler/scheduler-deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
serviceAccountName: {{ include "airflow.serviceAccountName" . }}
7676
initContainers:
7777
{{- if $extraPipPackages }}
78-
{{- include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
78+
{{- include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
7979
{{- end }}
8080
{{- include "airflow.init_container.check_db" . | indent 8 }}
8181
{{- include "airflow.init_container.wait_for_db_migrations" . | indent 8 }}
@@ -138,7 +138,7 @@ spec:
138138
SystemExit(f"UNHEALTHY - {count_alive_jobs} (more than 1) alive SchedulerJob for: {hostname}")
139139
{{- end }}
140140
{{- $extraVolumeMounts := .Values.scheduler.extraVolumeMounts }}
141-
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
141+
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
142142
{{- if or ($volumeMounts) (include "airflow.executor.kubernetes_like" .) }}
143143
volumeMounts:
144144
{{- $volumeMounts | indent 12 }}
@@ -156,7 +156,7 @@ spec:
156156
{{- toYaml .Values.airflow.extraContainers | nindent 8 }}
157157
{{- end }}
158158
{{- $extraVolumes := .Values.scheduler.extraVolumes }}
159-
{{- $volumes := include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
159+
{{- $volumes := include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
160160
{{- if or ($volumes) (include "airflow.executor.kubernetes_like" .) }}
161161
volumes:
162162
{{- $volumes | indent 8 }}

‎charts/airflow/templates/webserver/webserver-deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
{{- end }}
7676
initContainers:
7777
{{- if $extraPipPackages }}
78-
{{- include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
78+
{{- include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
7979
{{- end }}
8080
{{- include "airflow.init_container.check_db" . | indent 8 }}
8181
{{- include "airflow.init_container.wait_for_db_migrations" . | indent 8 }}
@@ -126,7 +126,7 @@ spec:
126126
port: web
127127
{{- end }}
128128
{{- $extraVolumeMounts := .Values.web.extraVolumeMounts }}
129-
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
129+
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
130130
volumeMounts:
131131
{{- $volumeMounts | indent 12 }}
132132
- name: webserver-config
@@ -140,7 +140,7 @@ spec:
140140
{{- toYaml .Values.airflow.extraContainers | nindent 8 }}
141141
{{- end }}
142142
{{- $extraVolumes := .Values.web.extraVolumes }}
143-
{{- $volumes := include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
143+
{{- $volumes := include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
144144
volumes:
145145
{{- $volumes | indent 8 }}
146146
- name: webserver-config

‎charts/airflow/templates/worker/worker-statefulset.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
{{- end }}
8181
initContainers:
8282
{{- if $extraPipPackages }}
83-
{{- include "airflow.init_container.install_pip_packages" (dict "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
83+
{{- include "airflow.init_container.install_pip_packages" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages) | indent 8 }}
8484
{{- end }}
8585
{{- include "airflow.init_container.check_db" . | indent 8 }}
8686
{{- include "airflow.init_container.wait_for_db_migrations" . | indent 8 }}
@@ -155,7 +155,7 @@ spec:
155155
- "exec airflow celery worker"
156156
{{- end }}
157157
{{- $extraVolumeMounts := .Values.workers.extraVolumeMounts }}
158-
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
158+
{{- $volumeMounts := include "airflow.volumeMounts" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumeMounts" $extraVolumeMounts) }}
159159
{{- if $volumeMounts }}
160160
volumeMounts:
161161
{{- $volumeMounts | indent 12 }}
@@ -167,7 +167,7 @@ spec:
167167
{{- toYaml .Values.airflow.extraContainers | nindent 8 }}
168168
{{- end }}
169169
{{- $extraVolumes := .Values.workers.extraVolumes }}
170-
{{- $volumes := include "airflow.volumes" (dict "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
170+
{{- $volumes := include "airflow.volumes" (dict "Release" .Release "Values" .Values "extraPipPackages" $extraPipPackages "extraVolumes" $extraVolumes) }}
171171
{{- if $volumes }}
172172
volumes:
173173
{{- $volumes | indent 8 }}

0 commit comments

Comments
 (0)