[stable/airflow] 7.1.1 hotfix (#22523)

Signed-off-by: Mathew Wicks <thesuperzapper@users.noreply.github.com>
This commit is contained in:
Mathew Wicks
2020-05-26 00:27:11 -07:00
committed by GitHub
parent 015274aef6
commit 3e7dde8921
10 changed files with 32 additions and 25 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Airflow is a platform to programmatically author, schedule and monitor workflows
name: airflow
version: 7.1.0
version: 7.1.1
appVersion: 1.10.10
icon: https://airflow.apache.org/_images/pin_large.png
home: https://airflow.apache.org/
+1 -1
View File
@@ -516,7 +516,7 @@ __Global Values:__
| --- | --- | --- |
| `airflow.image.*` | configs for the docker image of the web/scheduler/worker | `<see values.yaml>` |
| `airflow.executor` | the airflow executor type to use | `CeleryExecutor` |
| `airflow.fernetKey` | the fernet key used to encrypt the connections in the database | `""` |
| `airflow.fernetKey` | the fernet key used to encrypt the connections/variables in the database | `7T512UXSSmBOkpWimFHIVb8jK6lfmSAvx4mO6Arehnc=` |
| `airflow.config` | environment variables for the web/scheduler/worker pods (for airflow configs) | `{}` |
| `airflow.podAnnotations` | extra annotations for the web/scheduler/worker/flower Pods | `{}` |
| `airflow.extraEnv` | extra environment variables for the web/scheduler/worker/flower Pods | `[]` |
+3 -2
View File
@@ -21,8 +21,9 @@ __The following IMPROVEMENTS have been made:__
__The following values have CHANGED DEFAULTS:__
* `airflow.fernetKey`:
* Is now `""` by default, to enforce that users generate a custom one.
(However, please consider using `airflow.extraEnv` to define it from a pre-created secret)
* ~~Is now `""` by default, to enforce that users generate a custom one.~~
~~(However, please consider using `airflow.extraEnv` to define it from a pre-created secret)~~
__(We have undone this change in `7.1.1`, but we still encourage you to set a custom fernetKey!)__
* `dags.installRequirements`:
* Is now `false` by default, as this was an unintended change with the 7.0.0 upgrade.
@@ -27,6 +27,7 @@
# - Secret: airflow-cluster1-fernet-key
# - Secret: airflow-cluster1-mysql-password
# - Secret: airflow-cluster1-redis-password
# - Secret: airflow-cluster1-git-keys
# - ConfigMap: airflow-cluster1-webserver-config
# - cert-manager.io/Certificate: airflow-cluster1-cert
#
@@ -3,7 +3,7 @@
# - This is intended to be a `custom-values.yaml` starting point for non-production deployment (like minikube)
# External Dependencies:
# - A git repo for DAGs: ssh://git@repo.example.com:my-airflow-dags.git
# - A PUBLIC git repo for DAGs: ssh://git@repo.example.com:my-airflow-dags.git
#
###################################
@@ -267,13 +267,14 @@ spec:
configMap:
name: {{ include "airflow.fullname" . }}-scripts
defaultMode: 0755
{{- if .Values.dags.persistence.enabled }}
- name: dags-data
{{- if .Values.dags.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ .Values.dags.persistence.existingClaim | default (include "airflow.fullname" . ) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
- name: dags-data
emptyDir: {}
{{- end }}
{{- end }}
{{- if .Values.logs.persistence.enabled }}
- name: logs-data
persistentVolumeClaim:
@@ -260,13 +260,14 @@ spec:
secret:
secretName: {{ . }}
{{- end }}
{{- if .Values.dags.persistence.enabled }}
- name: dags-data
{{- if .Values.dags.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ .Values.dags.persistence.existingClaim | default (include "airflow.fullname" .) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
claimName: {{ .Values.dags.persistence.existingClaim | default (include "airflow.fullname" . ) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
- name: dags-data
emptyDir: {}
{{- end }}
{{- end }}
{{- if .Values.logs.persistence.enabled }}
- name: logs-data
persistentVolumeClaim:
+1 -1
View File
@@ -11,7 +11,7 @@ metadata:
heritage: {{ .Release.Service }}
spec:
{{- if .Values.scheduler.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ .Values.scheduler.podDisruptionBudget.minAvailable }}
maxUnavailable: {{ .Values.scheduler.podDisruptionBudget.maxUnavailable }}
{{- end }}
{{- if .Values.scheduler.podDisruptionBudget.minAvailable }}
minAvailable: {{ .Values.scheduler.podDisruptionBudget.minAvailable }}
@@ -239,13 +239,14 @@ spec:
secret:
secretName: {{ . }}
{{- end }}
{{- if .Values.dags.persistence.enabled }}
- name: dags-data
{{- if .Values.dags.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ .Values.dags.persistence.existingClaim | default (include "airflow.fullname" .) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
claimName: {{ .Values.dags.persistence.existingClaim | default (include "airflow.fullname" . ) }}
{{- else if or (.Values.dags.initContainer.enabled) (.Values.dags.git.gitSync.enabled) }}
- name: dags-data
emptyDir: {}
{{- end }}
{{- end }}
{{- if .Values.logs.persistence.enabled }}
- name: logs-data
persistentVolumeClaim:
+10 -8
View File
@@ -27,21 +27,19 @@ airflow:
##
executor: CeleryExecutor
## the fernet key used to encrypt the connections in the database
## the fernet key used to encrypt the connections/variables in the database
##
## WARNING:
## - you MUST create a custom fernet key, otherwise your connections will not
## necessarily be readable from all Pods
## - you MUST customise this value, otherwise the encryption will be somewhat pointless
##
## NOTE:
## - to prevent this value being stored in your values.yaml (and airflow-env ConfigMap),
## consider using `airflow.extraEnv` to define it from a pre-created secret
##
## GENERATE:
## python -c "from cryptography.fernet import Fernet; FERNET_KEY = Fernet.generate_key().decode(); print(FERNET_KEY)"
##
## EXAMPLE:
## fernetKey: "7T512UXSSmBOkpWimFHIVb8jK6lfmSAvx4mO6Arehnc="
##
fernetKey: ""
fernetKey: "7T512UXSSmBOkpWimFHIVb8jK6lfmSAvx4mO6Arehnc="
## environment variables for the web/scheduler/worker Pods (for airflow configs)
##
@@ -210,7 +208,11 @@ scheduler:
## the maximum unavailable pods/percentage for the scheduler
##
maxUnavailable: "1"
## NOTE:
## - as there is only ever a single scheduler Pod,
## this must be 100% for Kubernetes to be able to migrate it
##
maxUnavailable: "100%"
## the minimum available pods/percentage for the scheduler
##