From 641f77402bd8d5de1222f5fc6702fea9aaf19d93 Mon Sep 17 00:00:00 2001 From: Chia-Chun Tai Date: Wed, 1 May 2019 23:16:58 +0800 Subject: [PATCH] [stable/airflow] Add checksum annotations to roll deployments when configmaps or secrets change (#13432) Signed-off-by: Chia-Chun Tai --- stable/airflow/Chart.yaml | 2 +- stable/airflow/templates/_helpers.tpl | 4 ++-- .../{configmap-airflow.yaml => configmap-env.yaml} | 0 ...gmap-variables.yaml => configmap-variables-pools.yaml} | 0 stable/airflow/templates/deployments-flower.yaml | 4 ++-- stable/airflow/templates/deployments-scheduler.yaml | 8 ++++++-- stable/airflow/templates/deployments-web.yaml | 6 ++++-- stable/airflow/templates/secret-connections.yaml | 0 .../airflow/templates/{secrets.yaml => secret-env.yaml} | 2 +- stable/airflow/templates/statefulsets-workers.yaml | 6 ++++-- 10 files changed, 20 insertions(+), 12 deletions(-) rename stable/airflow/templates/{configmap-airflow.yaml => configmap-env.yaml} (100%) rename stable/airflow/templates/{configmap-variables.yaml => configmap-variables-pools.yaml} (100%) mode change 100755 => 100644 stable/airflow/templates/deployments-scheduler.yaml mode change 100755 => 100644 stable/airflow/templates/secret-connections.yaml rename stable/airflow/templates/{secrets.yaml => secret-env.yaml} (91%) diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml index 75a0bfd069..1b5f590a34 100644 --- a/stable/airflow/Chart.yaml +++ b/stable/airflow/Chart.yaml @@ -1,6 +1,6 @@ description: Airflow is a platform to programmatically author, schedule and monitor workflows name: airflow -version: 2.6.0 +version: 2.7.0 appVersion: 1.10.2 icon: https://airflow.apache.org/_images/pin_large.png home: https://airflow.apache.org/ diff --git a/stable/airflow/templates/_helpers.tpl b/stable/airflow/templates/_helpers.tpl index f8a1bd83dd..48b6180bc4 100644 --- a/stable/airflow/templates/_helpers.tpl +++ b/stable/airflow/templates/_helpers.tpl @@ -84,7 +84,7 @@ Create the name for the airflow secret. Map environment vars to secrets */}} {{- define "airflow.mapenvsecrets" -}} - {{- $secretName := .Release.Name | trunc 63 | trimSuffix "-" }} + {{- $secretName := printf "%s-env" (include "airflow.fullname" .) }} {{- $mapping := .Values.airflow.defaultSecretsMapping }} {{- if .Values.existingAirflowSecret }} {{- $secretName := .Values.existingAirflowSecret }} @@ -105,4 +105,4 @@ Map environment vars to secrets key: {{ $val.secretKey }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/airflow/templates/configmap-airflow.yaml b/stable/airflow/templates/configmap-env.yaml similarity index 100% rename from stable/airflow/templates/configmap-airflow.yaml rename to stable/airflow/templates/configmap-env.yaml diff --git a/stable/airflow/templates/configmap-variables.yaml b/stable/airflow/templates/configmap-variables-pools.yaml similarity index 100% rename from stable/airflow/templates/configmap-variables.yaml rename to stable/airflow/templates/configmap-variables-pools.yaml diff --git a/stable/airflow/templates/deployments-flower.yaml b/stable/airflow/templates/deployments-flower.yaml index a8ae47f1a3..5f27520018 100644 --- a/stable/airflow/templates/deployments-flower.yaml +++ b/stable/airflow/templates/deployments-flower.yaml @@ -25,8 +25,8 @@ spec: template: metadata: annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }} - configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env" + checksum/config-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }} + checksum/secret-env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }} labels: app: {{ template "airflow.name" . }} component: flower diff --git a/stable/airflow/templates/deployments-scheduler.yaml b/stable/airflow/templates/deployments-scheduler.yaml old mode 100755 new mode 100644 index c703bc57da..12756caca9 --- a/stable/airflow/templates/deployments-scheduler.yaml +++ b/stable/airflow/templates/deployments-scheduler.yaml @@ -25,8 +25,12 @@ spec: template: metadata: annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }} - configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env" + checksum/config-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }} + checksum/config-git-clone: {{ include (print $.Template.BasePath "/configmap-git-clone.yaml") . | sha256sum }} + checksum/config-scripts: {{ include (print $.Template.BasePath "/configmap-scripts.yaml") . | sha256sum }} + checksum/config-variables-pools: {{ include (print $.Template.BasePath "/configmap-variables-pools.yaml") . | sha256sum }} + checksum/secret-connections: {{ include (print $.Template.BasePath "/secret-connections.yaml") . | sha256sum }} + checksum/secret-env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }} {{- if .Values.airflow.podAnnotations }} {{ toYaml .Values.airflow.podAnnotations | indent 8 }} {{- end }} diff --git a/stable/airflow/templates/deployments-web.yaml b/stable/airflow/templates/deployments-web.yaml index a69108fe50..845395e083 100644 --- a/stable/airflow/templates/deployments-web.yaml +++ b/stable/airflow/templates/deployments-web.yaml @@ -25,8 +25,10 @@ spec: template: metadata: annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }} - configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env" + checksum/config-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }} + checksum/config-git-clone: {{ include (print $.Template.BasePath "/configmap-git-clone.yaml") . | sha256sum }} + checksum/config-scripts: {{ include (print $.Template.BasePath "/configmap-scripts.yaml") . | sha256sum }} + checksum/secret-env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }} {{- if .Values.airflow.podAnnotations }} {{ toYaml .Values.airflow.podAnnotations | indent 8 }} {{- end }} diff --git a/stable/airflow/templates/secret-connections.yaml b/stable/airflow/templates/secret-connections.yaml old mode 100755 new mode 100644 diff --git a/stable/airflow/templates/secrets.yaml b/stable/airflow/templates/secret-env.yaml similarity index 91% rename from stable/airflow/templates/secrets.yaml rename to stable/airflow/templates/secret-env.yaml index 47728198cc..f03edc4b6e 100644 --- a/stable/airflow/templates/secrets.yaml +++ b/stable/airflow/templates/secret-env.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "airflow.fullname" . }} + name: {{ template "airflow.fullname" . }}-env labels: app: {{ template "airflow.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" diff --git a/stable/airflow/templates/statefulsets-workers.yaml b/stable/airflow/templates/statefulsets-workers.yaml index 93b6c2a6b4..26167bea32 100644 --- a/stable/airflow/templates/statefulsets-workers.yaml +++ b/stable/airflow/templates/statefulsets-workers.yaml @@ -29,8 +29,10 @@ spec: template: metadata: annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }} - configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env" + checksum/config-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }} + checksum/config-git-clone: {{ include (print $.Template.BasePath "/configmap-git-clone.yaml") . | sha256sum }} + checksum/config-scripts: {{ include (print $.Template.BasePath "/configmap-scripts.yaml") . | sha256sum }} + checksum/secret-env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }} {{- if .Values.airflow.podAnnotations }} {{ toYaml .Values.airflow.podAnnotations | indent 8 }} {{- end }}