Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

Implements #11353 : [stable/airflow] install-requirements.sh script s… #11357

Merged
merged 3 commits into from
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/airflow/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description: Airflow is a platform to programmatically author, schedule and monitor workflows
name: airflow
version: 0.17.1
version: 0.17.2
appVersion: 1.10.0
icon: https://airflow.apache.org/_images/pin_large.png
home: https://airflow.apache.org/
Expand Down
12 changes: 6 additions & 6 deletions stable/airflow/templates/deployments-scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ spec:
env:
{{- include "airflow.mapenvsecrets" . | indent 10 }}
volumeMounts:
- name: scripts
mountPath: /usr/local/scripts
{{- if .Values.persistence.enabled }}
- name: dags-data
mountPath: {{ .Values.dags.path }}
{{- else if .Values.dags.initContainer.enabled }}
- name: dags-data
mountPath: {{ .Values.dags.path }}
- name: scripts
mountPath: /usr/local/scripts
{{- if .Values.airflow.connections }}
- name: connections
mountPath: /usr/local/connections
Expand Down Expand Up @@ -117,6 +117,10 @@ spec:
airflow scheduler -n {{ .Values.airflow.schedulerNumRuns }}
{{- end }}
volumes:
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
- name: dags-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
Expand All @@ -130,10 +134,6 @@ spec:
claimName: {{ .Values.logsPersistence.existingClaim | default (printf "%s-logs" (include "airflow.fullname" . | trunc 58 )) }}
{{- end }}
{{- if .Values.dags.initContainer.enabled }}
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
- name: git-clone
configMap:
name: {{ template "airflow.fullname" . }}-git-clone
Expand Down
12 changes: 6 additions & 6 deletions stable/airflow/templates/deployments-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ spec:
env:
{{- include "airflow.mapenvsecrets" . | indent 10 }}
volumeMounts:
- name: scripts
mountPath: /usr/local/scripts
{{- if .Values.persistence.enabled }}
- name: dags-data
mountPath: {{ .Values.dags.path }}
{{- else if .Values.dags.initContainer.enabled }}
- name: dags-data
mountPath: {{ .Values.dags.path }}
- name: scripts
mountPath: /usr/local/scripts
{{- end }}
{{- if .Values.logsPersistence.enabled }}
- name: logs-data
Expand Down Expand Up @@ -118,6 +118,10 @@ spec:
successThreshold: 1
failureThreshold: 5
volumes:
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
- name: dags-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
Expand All @@ -131,10 +135,6 @@ spec:
claimName: {{ .Values.logsPersistence.existingClaim | default (printf "%s-logs" (include "airflow.fullname" . | trunc 58 )) }}
{{- end }}
{{- if .Values.dags.initContainer.enabled }}
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
- name: git-clone
configMap:
name: {{ template "airflow.fullname" . }}-git-clone
Expand Down
12 changes: 6 additions & 6 deletions stable/airflow/templates/statefulsets-workers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ spec:
env:
{{- include "airflow.mapenvsecrets" . | indent 10 }}
volumeMounts:
- name: scripts
mountPath: /usr/local/scripts
{{- $secretsDir := .Values.workers.secretsDir -}}
{{- range .Values.workers.secrets }}
- name: {{ . }}-volume
Expand All @@ -90,8 +92,6 @@ spec:
{{- else if .Values.dags.initContainer.enabled }}
- name: dags-data
mountPath: {{ .Values.dags.path }}
- name: scripts
mountPath: /usr/local/scripts
{{- end }}
args:
- "bash"
Expand Down Expand Up @@ -122,6 +122,10 @@ spec:
resources:
{{ toYaml .Values.workers.resources | indent 12 }}
volumes:
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
{{- range .Values.workers.secrets }}
- name: {{ . }}-volume
secret:
Expand All @@ -135,10 +139,6 @@ spec:
emptyDir: {}
{{- end }}
{{- if .Values.dags.initContainer.enabled }}
- name: scripts
configMap:
name: {{ template "airflow.fullname" . }}-scripts
defaultMode: 0755
- name: git-clone
configMap:
name: {{ template "airflow.fullname" . }}-git-clone
Expand Down