From fce2a60ca3bce3911746647376f29d053a7975fa Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Mon, 31 Oct 2022 08:31:27 +0100
Subject: [PATCH 01/16] Add webserverConfigConfigmapName to Helm chart to use
 an existing configmap for webserver_config.py

---
 chart/templates/_helpers.yaml                      | 11 +++++++++++
 .../templates/configmaps/webserver-configmap.yaml  |  4 ++--
 .../templates/scheduler/scheduler-deployment.yaml  | 11 +++++++++++
 .../templates/triggerer/triggerer-deployment.yaml  |  8 ++++++++
 .../templates/webserver/webserver-deployment.yaml  | 14 +++++++-------
 chart/templates/workers/worker-deployment.yaml     |  8 ++++++++
 chart/values.schema.json                           | 14 +++++++++++++-
 chart/values.yaml                                  |  7 +++++--
 8 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index 1ff7a64cae347..71094bedcefd8 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -443,6 +443,17 @@ server_tls_key_file = /etc/pgbouncer/server.key
 {{ (printf "%s/webserver_config.py" .Values.airflowHome) | quote }}
 {{- end }}
 
+{{ define "airflow_webserver_config_configmap_name" -}}
+{{ default (printf "%s-webserver-config" .Release.Name) .Values.webserver.webserverConfigConfigmapName }}
+{{- end }}
+
+{{ define "airflow_webserver_config_mount" -}}
+- name: webserver-config
+  mountPath: {{ template "airflow_webserver_config_path" . }}
+  subPath: webserver_config.py
+  readOnly: "True"
+{{- end -}}
+
 {{ define "airflow_local_setting_path" -}}
 {{ (printf "%s/config/airflow_local_settings.py" .Values.airflowHome) | quote }}
 {{- end }}
diff --git a/chart/templates/configmaps/webserver-configmap.yaml b/chart/templates/configmaps/webserver-configmap.yaml
index e8d5ca016e725..e3709f65e4a14 100644
--- a/chart/templates/configmaps/webserver-configmap.yaml
+++ b/chart/templates/configmaps/webserver-configmap.yaml
@@ -18,11 +18,11 @@
 ################################
 ## Airflow ConfigMap
 #################################
-{{- if .Values.webserver.webserverConfig }}
+{{- if and .Values.webserver.webserverConfig (not .Values.webserver.webserverConfigConfigmapName) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-webserver-config
+  name: {{ template "airflow_webserver_config_configmap_name" . }}
   labels:
     tier: airflow
     component: config
diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index f3c381492aa48..107f07de1adaf 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -140,6 +140,9 @@ spec:
               mountPath: {{ template "airflow_config_path" . }}
               subPath: airflow.cfg
               readOnly: true
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
           envFrom:
@@ -242,6 +245,9 @@ spec:
           volumeMounts:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           {{- end }}
 {{- if .Values.scheduler.extraContainers }}
 {{- toYaml .Values.scheduler.extraContainers | nindent 8 }}
@@ -250,6 +256,11 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        - name: webserver-config
+          configMap:
+            name: {{ template "airflow_webserver_config_configmap_name" . }}
+        {{- end }}
 {{- if $localOrDagProcessorDisabled }}
         {{- if .Values.dags.persistence.enabled }}
         - name: dags
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index 434b1037c3006..27c15d33c1d2a 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -120,6 +120,9 @@ spec:
               mountPath: {{ template "airflow_config_path" . }}
               subPath: airflow.cfg
               readOnly: true
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           args:
           {{- include "wait-for-migrations-command" . | nindent 10 }}
           envFrom:
@@ -196,6 +199,11 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        - name: webserver-config
+          configMap:
+            name: {{ template "airflow_webserver_config_configmap_name" . }}
+        {{- end }}
         {{- if .Values.dags.persistence.enabled }}
         - name: dags
           persistentVolumeClaim:
diff --git a/chart/templates/webserver/webserver-deployment.yaml b/chart/templates/webserver/webserver-deployment.yaml
index 0a3033a0292f1..109112e390fde 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -132,6 +132,9 @@ spec:
               mountPath: {{ template "airflow_config_path" . }}
               subPath: airflow.cfg
               readOnly: true
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
           envFrom:
@@ -172,11 +175,8 @@ spec:
               mountPath: {{ template "airflow_config_path" . }}
               subPath: airflow.cfg
               readOnly: true
-{{- if .Values.webserver.webserverConfig }}
-            - name: webserver-config
-              mountPath: {{ template "airflow_webserver_config_path" . }}
-              subPath: webserver_config.py
-              readOnly: true
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
 {{- end }}
 {{- if .Values.airflowLocalSettings }}
             - name: config
@@ -241,10 +241,10 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
-        {{- if .Values.webserver.webserverConfig }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
         - name: webserver-config
           configMap:
-            name: {{ .Release.Name }}-webserver-config
+            name: {{ template "airflow_webserver_config_configmap_name" . }}
         {{- end }}
         {{- if (semverCompare "<2.0.0" .Values.airflowVersion) }}
         {{- if .Values.dags.persistence.enabled }}
diff --git a/chart/templates/workers/worker-deployment.yaml b/chart/templates/workers/worker-deployment.yaml
index ccd7abd50a45c..2184e7a823f90 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -150,6 +150,9 @@ spec:
               mountPath: {{ template "airflow_config_path" . }}
               subPath: airflow.cfg
               readOnly: true
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
           envFrom:
@@ -315,6 +318,11 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        - name: webserver-config
+          configMap:
+            name: {{ template "airflow_webserver_config_configmap_name" . }}
+        {{- end }}
         {{- if .Values.kerberos.enabled }}
         - name: kerberos-keytab
           secret:
diff --git a/chart/values.schema.json b/chart/values.schema.json
index 234ad58900fc6..dc68a1a433d0c 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -3414,7 +3414,7 @@
                     }
                 },
                 "webserverConfig": {
-                    "description": "This string (can be templated) will be mounted into the Airflow webserver as a custom `webserver_config.py`. You can bake a `webserver_config.py` in to your image instead.",
+                    "description": "This string (can be templated) will be mounted into the Airflow webserver as a custom `webserver_config.py`. You can bake a `webserver_config.py` in to your image instead or specify a configmap containing the webserver_config.py.",
                     "type": [
                         "string",
                         "null"
@@ -3425,6 +3425,18 @@
                         "from airflow import configuration as conf\n\n# The SQLAlchemy connection string.\nSQLALCHEMY_DATABASE_URI = conf.get('database', 'SQL_ALCHEMY_CONN')\n\n# Flask-WTF flag for CSRF\nCSRF_ENABLED = True"
                     ]
                 },
+                "webserverConfigConfigmapName": {
+                    "description": "The configmap name containing the webserver_config.py.",
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "x-docsSection": "Common",
+                    "default": null,
+                    "examples": [
+                        "my-webserver-configmap"
+                    ]
+                },
                 "service": {
                     "description": "Webserver Service configuration.",
                     "type": "object",
diff --git a/chart/values.yaml b/chart/values.yaml
index bda009b09bf77..a63c0e8392a41 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -965,8 +965,10 @@ webserver:
   extraVolumes: []
   extraVolumeMounts: []
 
-  # This string (can be templated) will be mounted into the Airflow Webserver as a custom
-  # webserver_config.py. You can bake a webserver_config.py in to your image instead.
+  # This string (can be templated) will be mounted into the Airflow Webserver
+  # as a custom webserver_config.py. You can bake a webserver_config.py in to
+  # your image instead or specify a configmap containing the
+  # webserver_config.py.
   webserverConfig: ~
   # webserverConfig: |
   #   from airflow import configuration as conf
@@ -976,6 +978,7 @@ webserver:
 
   #   # Flask-WTF flag for CSRF
   #   CSRF_ENABLED = True
+  webserverConfigConfigmapName: ~
 
   service:
     type: ClusterIP

From b34b3fb91e1d05d1198f3f641e9e5ac7fbd1ecc1 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Mon, 31 Oct 2022 11:41:56 +0100
Subject: [PATCH 02/16] Add missing mounts in optional worker sidecars and
 containers with extraVolumeMounts

---
 chart/templates/scheduler/scheduler-deployment.yaml | 3 +++
 chart/templates/triggerer/triggerer-deployment.yaml | 3 +++
 chart/templates/workers/worker-deployment.yaml      | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index 107f07de1adaf..e8f86044d8427 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -216,6 +216,9 @@ spec:
               subPath: airflow_local_settings.py
               readOnly: true
             {{- end }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
 {{- if and $localOrDagProcessorDisabled (or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled) }}
 {{- include "airflow_dags_mount" . | nindent 12 }}
 {{- end }}
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index 27c15d33c1d2a..3ab400dc2d2b5 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -168,6 +168,9 @@ spec:
               subPath: airflow_local_settings.py
               readOnly: true
             {{- end }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
             {{- include "airflow_dags_mount" . | nindent 12 }}
             {{- end }}
diff --git a/chart/templates/workers/worker-deployment.yaml b/chart/templates/workers/worker-deployment.yaml
index 2184e7a823f90..aa4888fa663c7 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -228,6 +228,9 @@ spec:
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
             {{- include "airflow_dags_mount" . | nindent 12 }}
             {{- end }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}
           env:
@@ -266,6 +269,9 @@ spec:
           volumeMounts:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
 {{- end }}
         {{- if .Values.workers.kerberosSidecar.enabled }}
         - name: worker-kerberos
@@ -298,6 +304,9 @@ spec:
             - name: kerberos-ccache
               mountPath: {{ .Values.kerberos.ccacheMountPath | quote }}
               readOnly: false
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+            {{ include "airflow_webserver_config_mount" | indent 12 }}
+{{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}
           env:

From 8b38f24fccd4dd43feaa4d1bc3810a05b65115df Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Mon, 31 Oct 2022 19:12:24 +0100
Subject: [PATCH 03/16] Add Helm tests for webserverConfigConfigmapName

---
 tests/charts/test_webserver.py | 50 ++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index facaa97a30a22..4c78a87d53f5a 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -725,6 +725,18 @@ def test_no_webserver_config_configmap_by_default(self):
         docs = render_chart(show_only=["templates/configmaps/webserver-configmap.yaml"])
         assert 0 == len(docs)
 
+    def test_no_webserver_config_configmap_with_configmap_name(self):
+        docs = render_chart(
+            values={
+                "webserver": {
+                    "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
+                    "webserverConfigConfigmapName": "my-configmap",
+                }
+            },
+            show_only=["templates/configmaps/webserver-configmap.yaml"],
+        )
+        assert 0 == len(docs)
+
     def test_webserver_config_configmap(self):
         docs = render_chart(
             values={"webserver": {"webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}"}},
@@ -738,6 +750,44 @@ def test_webserver_config_configmap(self):
             == jmespath.search('data."webserver_config.py"', docs[0]).strip()
         )
 
+    def test_webserver_config_configmap_name_volume_mounts(self):
+        configmap_name = "my-configmap"
+        docs = render_chart(
+            values={
+                "scheduler": {"logGroomerSidecar": {"enabled": True}, "waitForMigrations": {"enabled": True}},
+                "triggerer": {"waitForMigrations": {"enabled": True}},
+                "webserver": {
+                    "waitForMigrations": {"enabled": True},
+                    "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
+                    "webserverConfigConfigmapName": configmap_name,
+                },
+                "workers": {"kerberosSidecar": {"enabled": True}, "persistence": {"enabled": True}},
+            },
+            show_only=[
+                "templates/configmaps/scheduler-deployment.yaml",
+                "templates/configmaps/triggerer-deployment.yaml"
+                "templates/configmaps/webserver-deployment.yaml"
+                "templates/configmaps/worker-deployment.yaml",
+            ],
+        )
+        for index in range(len(docs)):
+            print(docs[index])
+            assert "webserver-config" in [
+                c["name"]
+                for c in jmespath.search(
+                    "spec.template.spec.initContainers[?name='wait-for-airflow-migrations'].volumeMounts",
+                    docs[index],
+                )
+            ]
+            for container in jmespath.search("spec.template.spec.containers", docs[index]):
+                assert "webserver-config" in [c["name"] for c in jmespath.search("volumeMounts", container)]
+            assert "webserver-config" in [
+                c["name"] for c in jmespath.search("spec.template.spec.volumes", docs[index])
+            ]
+            assert configmap_name == jmespath.search(
+                "spec.template.spec.volumes[?name='webserver-config'].configMap.name | [0]", docs[index]
+            )
+
 
 class TestWebserverNetworkPolicy:
     def test_off_by_default(self):

From d9b2bc34c35d9de517f710264119cd0e64641132 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 10:57:17 +0100
Subject: [PATCH 04/16] Add missing commas in test_webserver.py

---
 tests/charts/test_webserver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 4c78a87d53f5a..35122a3dbcbf2 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -765,8 +765,8 @@ def test_webserver_config_configmap_name_volume_mounts(self):
             },
             show_only=[
                 "templates/configmaps/scheduler-deployment.yaml",
-                "templates/configmaps/triggerer-deployment.yaml"
-                "templates/configmaps/webserver-deployment.yaml"
+                "templates/configmaps/triggerer-deployment.yaml",
+                "templates/configmaps/webserver-deployment.yaml",
                 "templates/configmaps/worker-deployment.yaml",
             ],
         )

From 0ca6ed758d937ddd078791ad96783fd86e596a3f Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 16:05:50 +0100
Subject: [PATCH 05/16] Add missing argument to include directives

---
 chart/templates/scheduler/scheduler-deployment.yaml | 6 +++---
 chart/templates/triggerer/triggerer-deployment.yaml | 4 ++--
 chart/templates/webserver/webserver-deployment.yaml | 4 ++--
 chart/templates/workers/worker-deployment.yaml      | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index e8f86044d8427..fe36f62bc1c0c 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -141,7 +141,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -217,7 +217,7 @@ spec:
               readOnly: true
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if and $localOrDagProcessorDisabled (or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled) }}
 {{- include "airflow_dags_mount" . | nindent 12 }}
@@ -249,7 +249,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           {{- end }}
 {{- if .Values.scheduler.extraContainers }}
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index 3ab400dc2d2b5..ee85dc797ee73 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -121,7 +121,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | nindent 10 }}
@@ -169,7 +169,7 @@ spec:
               readOnly: true
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
             {{- include "airflow_dags_mount" . | nindent 12 }}
diff --git a/chart/templates/webserver/webserver-deployment.yaml b/chart/templates/webserver/webserver-deployment.yaml
index 109112e390fde..57cb97a878410 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -133,7 +133,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -176,7 +176,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if .Values.airflowLocalSettings }}
             - name: config
diff --git a/chart/templates/workers/worker-deployment.yaml b/chart/templates/workers/worker-deployment.yaml
index aa4888fa663c7..a8d8544abef47 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -151,7 +151,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -229,7 +229,7 @@ spec:
             {{- include "airflow_dags_mount" . | nindent 12 }}
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}
@@ -270,7 +270,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- end }}
         {{- if .Values.workers.kerberosSidecar.enabled }}
@@ -305,7 +305,7 @@ spec:
               mountPath: {{ .Values.kerberos.ccacheMountPath | quote }}
               readOnly: false
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" | indent 12 }}
+            {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}

From 9c62b24ce7f8568a3bc9b2cae98777f52e6d7a48 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 18:52:10 +0100
Subject: [PATCH 06/16] Correct readOnly value for the webserver-config
 volumeMount

---
 chart/templates/_helpers.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index 71094bedcefd8..5318c168163e1 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -451,7 +451,7 @@ server_tls_key_file = /etc/pgbouncer/server.key
 - name: webserver-config
   mountPath: {{ template "airflow_webserver_config_path" . }}
   subPath: webserver_config.py
-  readOnly: "True"
+  readOnly: True
 {{- end -}}
 
 {{ define "airflow_local_setting_path" -}}

From 827c2ab15e3cf0137e04834009578c377a53b746 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 18:52:42 +0100
Subject: [PATCH 07/16] Correct rendered templates for
 test_webserver_config_configmap_name_volume_mounts

---
 tests/charts/test_webserver.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 35122a3dbcbf2..80079f7e3bdee 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -764,10 +764,10 @@ def test_webserver_config_configmap_name_volume_mounts(self):
                 "workers": {"kerberosSidecar": {"enabled": True}, "persistence": {"enabled": True}},
             },
             show_only=[
-                "templates/configmaps/scheduler-deployment.yaml",
-                "templates/configmaps/triggerer-deployment.yaml",
-                "templates/configmaps/webserver-deployment.yaml",
-                "templates/configmaps/worker-deployment.yaml",
+                "templates/scheduler/scheduler-deployment.yaml",
+                "templates/triggerer/triggerer-deployment.yaml",
+                "templates/webserver/webserver-deployment.yaml",
+                "templates/workers/worker-deployment.yaml",
             ],
         )
         for index in range(len(docs)):

From 9bc57a695d42ae5d3a89459f768c1e5acaa3514e Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 18:53:21 +0100
Subject: [PATCH 08/16] Correct jmespath queries for
 test_webserver_config_configmap_name_volume_mounts

---
 tests/charts/test_webserver.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 80079f7e3bdee..3a2aa06691e65 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -774,10 +774,11 @@ def test_webserver_config_configmap_name_volume_mounts(self):
             print(docs[index])
             assert "webserver-config" in [
                 c["name"]
-                for c in jmespath.search(
-                    "spec.template.spec.initContainers[?name='wait-for-airflow-migrations'].volumeMounts",
+                for r in jmespath.search(
+                    "spec.template.spec.initContainers[?name=='wait-for-airflow-migrations'].volumeMounts",
                     docs[index],
                 )
+                for c in r
             ]
             for container in jmespath.search("spec.template.spec.containers", docs[index]):
                 assert "webserver-config" in [c["name"] for c in jmespath.search("volumeMounts", container)]
@@ -785,7 +786,7 @@ def test_webserver_config_configmap_name_volume_mounts(self):
                 c["name"] for c in jmespath.search("spec.template.spec.volumes", docs[index])
             ]
             assert configmap_name == jmespath.search(
-                "spec.template.spec.volumes[?name='webserver-config'].configMap.name | [0]", docs[index]
+                "spec.template.spec.volumes[?name=='webserver-config'].configMap.name | [0]", docs[index]
             )
 
 

From 5dba9002ac441bb4b6e5af4c77e8f80335b9b78c Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Tue, 1 Nov 2022 18:53:45 +0100
Subject: [PATCH 09/16] Correct the webserver-config volumeMount indentation in
 templates

---
 chart/templates/scheduler/scheduler-deployment.yaml | 6 +++---
 chart/templates/triggerer/triggerer-deployment.yaml | 4 ++--
 chart/templates/webserver/webserver-deployment.yaml | 4 ++--
 chart/templates/workers/worker-deployment.yaml      | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index fe36f62bc1c0c..42e00031ead02 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -141,7 +141,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -217,7 +217,7 @@ spec:
               readOnly: true
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if and $localOrDagProcessorDisabled (or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled) }}
 {{- include "airflow_dags_mount" . | nindent 12 }}
@@ -249,7 +249,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           {{- end }}
 {{- if .Values.scheduler.extraContainers }}
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index ee85dc797ee73..608deeb3ca908 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -121,7 +121,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | nindent 10 }}
@@ -169,7 +169,7 @@ spec:
               readOnly: true
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
             {{- include "airflow_dags_mount" . | nindent 12 }}
diff --git a/chart/templates/webserver/webserver-deployment.yaml b/chart/templates/webserver/webserver-deployment.yaml
index 57cb97a878410..0be6b12dadb49 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -133,7 +133,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -176,7 +176,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if .Values.airflowLocalSettings }}
             - name: config
diff --git a/chart/templates/workers/worker-deployment.yaml b/chart/templates/workers/worker-deployment.yaml
index a8d8544abef47..deb8ddd75ddad 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -151,7 +151,7 @@ spec:
               subPath: airflow.cfg
               readOnly: true
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
           {{- include "wait-for-migrations-command" . | indent 10 }}
@@ -229,7 +229,7 @@ spec:
             {{- include "airflow_dags_mount" . | nindent 12 }}
             {{- end }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}
@@ -270,7 +270,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- end }}
         {{- if .Values.workers.kerberosSidecar.enabled }}
@@ -305,7 +305,7 @@ spec:
               mountPath: {{ .Values.kerberos.ccacheMountPath | quote }}
               readOnly: false
 {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
-            {{ include "airflow_webserver_config_mount" . | indent 12 }}
+{{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
           {{- include "custom_airflow_environment_from" . | default "\n  []" | indent 10 }}

From 8fc08ed2fdd5c1d4fc3718f28cf268fb58b733e7 Mon Sep 17 00:00:00 2001
From: JulesTriomphe <35426973+JulesTriomphe@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:43:20 +0100
Subject: [PATCH 10/16] Rename webserverConfigConfigmapName to
 webserverConfigConfigMapName

Co-authored-by: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
---
 chart/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index a63c0e8392a41..1411214288f66 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -978,7 +978,7 @@ webserver:
 
   #   # Flask-WTF flag for CSRF
   #   CSRF_ENABLED = True
-  webserverConfigConfigmapName: ~
+  webserverConfigConfigMapName: ~
 
   service:
     type: ClusterIP

From b20b3795be8c46c6639c9b9adaf076c1bdc97b52 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Fri, 2 Dec 2022 19:07:10 +0100
Subject: [PATCH 11/16] Move test_webserver_config_configmap_name_volume_mounts
 to test_airflow_common.py

---
 tests/charts/test_airflow_common.py | 39 +++++++++++++++++++++++++++++
 tests/charts/test_webserver.py      | 39 -----------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tests/charts/test_airflow_common.py b/tests/charts/test_airflow_common.py
index 2a983c194e541..5f7b65c57a81f 100644
--- a/tests/charts/test_airflow_common.py
+++ b/tests/charts/test_airflow_common.py
@@ -89,6 +89,45 @@ def test_dags_mount(self, dag_values, expected_mount):
         for doc in docs:
             assert expected_mount in jmespath.search("spec.template.spec.containers[0].volumeMounts", doc)
 
+    def test_webserver_config_configmap_name_volume_mounts(self):
+        configmap_name = "my-configmap"
+        docs = render_chart(
+            values={
+                "scheduler": {"logGroomerSidecar": {"enabled": True}, "waitForMigrations": {"enabled": True}},
+                "triggerer": {"waitForMigrations": {"enabled": True}},
+                "webserver": {
+                    "waitForMigrations": {"enabled": True},
+                    "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
+                    "webserverConfigConfigmapName": configmap_name,
+                },
+                "workers": {"kerberosSidecar": {"enabled": True}, "persistence": {"enabled": True}},
+            },
+            show_only=[
+                "templates/scheduler/scheduler-deployment.yaml",
+                "templates/triggerer/triggerer-deployment.yaml",
+                "templates/webserver/webserver-deployment.yaml",
+                "templates/workers/worker-deployment.yaml",
+            ],
+        )
+        for index in range(len(docs)):
+            print(docs[index])
+            assert "webserver-config" in [
+                c["name"]
+                for r in jmespath.search(
+                    "spec.template.spec.initContainers[?name=='wait-for-airflow-migrations'].volumeMounts",
+                    docs[index],
+                )
+                for c in r
+            ]
+            for container in jmespath.search("spec.template.spec.containers", docs[index]):
+                assert "webserver-config" in [c["name"] for c in jmespath.search("volumeMounts", container)]
+            assert "webserver-config" in [
+                c["name"] for c in jmespath.search("spec.template.spec.volumes", docs[index])
+            ]
+            assert configmap_name == jmespath.search(
+                "spec.template.spec.volumes[?name=='webserver-config'].configMap.name | [0]", docs[index]
+            )
+
     def test_annotations(self):
         """
         Test Annotations are correctly applied on all pods created Scheduler, Webserver & Worker
diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 3a2aa06691e65..e627f9622019d 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -750,45 +750,6 @@ def test_webserver_config_configmap(self):
             == jmespath.search('data."webserver_config.py"', docs[0]).strip()
         )
 
-    def test_webserver_config_configmap_name_volume_mounts(self):
-        configmap_name = "my-configmap"
-        docs = render_chart(
-            values={
-                "scheduler": {"logGroomerSidecar": {"enabled": True}, "waitForMigrations": {"enabled": True}},
-                "triggerer": {"waitForMigrations": {"enabled": True}},
-                "webserver": {
-                    "waitForMigrations": {"enabled": True},
-                    "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
-                    "webserverConfigConfigmapName": configmap_name,
-                },
-                "workers": {"kerberosSidecar": {"enabled": True}, "persistence": {"enabled": True}},
-            },
-            show_only=[
-                "templates/scheduler/scheduler-deployment.yaml",
-                "templates/triggerer/triggerer-deployment.yaml",
-                "templates/webserver/webserver-deployment.yaml",
-                "templates/workers/worker-deployment.yaml",
-            ],
-        )
-        for index in range(len(docs)):
-            print(docs[index])
-            assert "webserver-config" in [
-                c["name"]
-                for r in jmespath.search(
-                    "spec.template.spec.initContainers[?name=='wait-for-airflow-migrations'].volumeMounts",
-                    docs[index],
-                )
-                for c in r
-            ]
-            for container in jmespath.search("spec.template.spec.containers", docs[index]):
-                assert "webserver-config" in [c["name"] for c in jmespath.search("volumeMounts", container)]
-            assert "webserver-config" in [
-                c["name"] for c in jmespath.search("spec.template.spec.volumes", docs[index])
-            ]
-            assert configmap_name == jmespath.search(
-                "spec.template.spec.volumes[?name=='webserver-config'].configMap.name | [0]", docs[index]
-            )
-
 
 class TestWebserverNetworkPolicy:
     def test_off_by_default(self):

From fd6ae72612380eeb2b3bb101f4cc945bb0cd51f3 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Fri, 2 Dec 2022 19:31:59 +0100
Subject: [PATCH 12/16] Rename webserverConfigConfigmapName to
 webserverConfigConfigMapName in the values schema

---
 chart/values.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/values.schema.json b/chart/values.schema.json
index 6cb2f978b4a86..325ed40d0ca04 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -3440,7 +3440,7 @@
                         "from airflow import configuration as conf\n\n# The SQLAlchemy connection string.\nSQLALCHEMY_DATABASE_URI = conf.get('database', 'SQL_ALCHEMY_CONN')\n\n# Flask-WTF flag for CSRF\nCSRF_ENABLED = True"
                     ]
                 },
-                "webserverConfigConfigmapName": {
+                "webserverConfigConfigMapName": {
                     "description": "The configmap name containing the webserver_config.py.",
                     "type": [
                         "string",

From e9c1cd724f41d419a689c0daecf800853937c32f Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <Jules.Triomphe@swisscom.com>
Date: Fri, 2 Dec 2022 19:44:08 +0100
Subject: [PATCH 13/16] Remove configurations that are true by default in
 test_webserver_config_configmap_name_volume_mounts

---
 tests/charts/test_airflow_common.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/charts/test_airflow_common.py b/tests/charts/test_airflow_common.py
index 5f7b65c57a81f..01b6ab823e639 100644
--- a/tests/charts/test_airflow_common.py
+++ b/tests/charts/test_airflow_common.py
@@ -93,14 +93,11 @@ def test_webserver_config_configmap_name_volume_mounts(self):
         configmap_name = "my-configmap"
         docs = render_chart(
             values={
-                "scheduler": {"logGroomerSidecar": {"enabled": True}, "waitForMigrations": {"enabled": True}},
-                "triggerer": {"waitForMigrations": {"enabled": True}},
                 "webserver": {
-                    "waitForMigrations": {"enabled": True},
                     "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
                     "webserverConfigConfigmapName": configmap_name,
                 },
-                "workers": {"kerberosSidecar": {"enabled": True}, "persistence": {"enabled": True}},
+                "workers": {"kerberosSidecar": {"enabled": True}},
             },
             show_only=[
                 "templates/scheduler/scheduler-deployment.yaml",

From e851f74f55a19dfebb97fda33590684e542ddcd4 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <jules.triomphe@swisscom.com>
Date: Sat, 3 Dec 2022 14:30:13 +0100
Subject: [PATCH 14/16] Rename webserverConfigConfigmapName to
 webserverConfigConfigMapName in tests

---
 tests/charts/test_airflow_common.py | 2 +-
 tests/charts/test_webserver.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/charts/test_airflow_common.py b/tests/charts/test_airflow_common.py
index 01b6ab823e639..bb1389334d16e 100644
--- a/tests/charts/test_airflow_common.py
+++ b/tests/charts/test_airflow_common.py
@@ -95,7 +95,7 @@ def test_webserver_config_configmap_name_volume_mounts(self):
             values={
                 "webserver": {
                     "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
-                    "webserverConfigConfigmapName": configmap_name,
+                    "webserverConfigConfigMapName": configmap_name,
                 },
                 "workers": {"kerberosSidecar": {"enabled": True}},
             },
diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 073212ed9ae52..c5551e730bb84 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -763,7 +763,7 @@ def test_no_webserver_config_configmap_with_configmap_name(self):
             values={
                 "webserver": {
                     "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
-                    "webserverConfigConfigmapName": "my-configmap",
+                    "webserverConfigConfigMapName": "my-configmap",
                 }
             },
             show_only=["templates/configmaps/webserver-configmap.yaml"],

From 4e95b6cf01fed655e8a329ab8f8eebdb3b10c656 Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <jules.triomphe@swisscom.com>
Date: Sat, 3 Dec 2022 15:38:06 +0100
Subject: [PATCH 15/16] Rename webserverConfigConfigmapName to
 webserverConfigConfigMapName in templates and helpers

---
 chart/templates/_helpers.yaml                          |  2 +-
 chart/templates/configmaps/webserver-configmap.yaml    |  2 +-
 chart/templates/scheduler/scheduler-deployment.yaml    |  8 ++++----
 chart/templates/triggerer/triggerer-deployment.yaml    |  6 +++---
 chart/templates/webserver/webserver-deployment.yaml    |  6 +++---
 chart/templates/workers/worker-deployment.yaml         | 10 +++++-----
 .../src/airflow_breeze/utils/docker_command_utils.py   |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index 1cb46dbb015c2..074ecc7d4914c 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -444,7 +444,7 @@ server_tls_key_file = /etc/pgbouncer/server.key
 {{- end }}
 
 {{ define "airflow_webserver_config_configmap_name" -}}
-{{ default (printf "%s-webserver-config" .Release.Name) .Values.webserver.webserverConfigConfigmapName }}
+{{ default (printf "%s-webserver-config" .Release.Name) .Values.webserver.webserverConfigConfigMapName }}
 {{- end }}
 
 {{ define "airflow_webserver_config_mount" -}}
diff --git a/chart/templates/configmaps/webserver-configmap.yaml b/chart/templates/configmaps/webserver-configmap.yaml
index e3709f65e4a14..26fb5094d969e 100644
--- a/chart/templates/configmaps/webserver-configmap.yaml
+++ b/chart/templates/configmaps/webserver-configmap.yaml
@@ -18,7 +18,7 @@
 ################################
 ## Airflow ConfigMap
 #################################
-{{- if and .Values.webserver.webserverConfig (not .Values.webserver.webserverConfigConfigmapName) }}
+{{- if and .Values.webserver.webserverConfig (not .Values.webserver.webserverConfigConfigMapName) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index 919f47bad5173..9f8411c716b07 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -140,7 +140,7 @@ spec:
 {{- if .Values.scheduler.extraVolumeMounts }}
 {{ toYaml .Values.scheduler.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
@@ -207,7 +207,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- include "airflow_config_mount" . | nindent 12 }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if and $localOrDagProcessorDisabled (or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled) }}
@@ -242,7 +242,7 @@ spec:
 {{- if .Values.scheduler.extraVolumeMounts }}
 {{ toYaml .Values.scheduler.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           {{- end }}
@@ -253,7 +253,7 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
-        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
         - name: webserver-config
           configMap:
             name: {{ template "airflow_webserver_config_configmap_name" . }}
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index cd394d0610506..33f478caed651 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -120,7 +120,7 @@ spec:
             {{- if .Values.triggerer.extraVolumeMounts }}
             {{ toYaml .Values.triggerer.extraVolumeMounts | nindent 12 }}
             {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
@@ -159,7 +159,7 @@ spec:
             - name: logs
               mountPath: {{ template "airflow_logs" . }}
 {{- include "airflow_config_mount" . | nindent 12 }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
@@ -193,7 +193,7 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
-        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
         - name: webserver-config
           configMap:
             name: {{ template "airflow_webserver_config_configmap_name" . }}
diff --git a/chart/templates/webserver/webserver-deployment.yaml b/chart/templates/webserver/webserver-deployment.yaml
index f03f2119cc642..81d97ab83d88b 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -132,7 +132,7 @@ spec:
 {{- if .Values.webserver.extraVolumeMounts }}
 {{ toYaml .Values.webserver.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
@@ -172,7 +172,7 @@ spec:
               readOnly: true
 {{- end }}
 {{- include "airflow_config_mount" . | nindent 12 }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- if and (semverCompare "<2.0.0" .Values.airflowVersion) (or .Values.dags.gitSync.enabled .Values.dags.persistence.enabled) }}
@@ -232,7 +232,7 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
-        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
         - name: webserver-config
           configMap:
             name: {{ template "airflow_webserver_config_configmap_name" . }}
diff --git a/chart/templates/workers/worker-deployment.yaml b/chart/templates/workers/worker-deployment.yaml
index 00d62a1a181c6..5e8969b669c49 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -150,7 +150,7 @@ spec:
 {{- if .Values.workers.extraVolumeMounts }}
 {{ toYaml .Values.workers.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           args:
@@ -219,7 +219,7 @@ spec:
             {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
             {{- include "airflow_dags_mount" . | nindent 12 }}
             {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
@@ -263,7 +263,7 @@ spec:
 {{- if .Values.workers.extraVolumeMounts }}
 {{ toYaml .Values.workers.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
 {{- end }}
@@ -292,7 +292,7 @@ spec:
 {{- if .Values.workers.extraVolumeMounts }}
 {{ toYaml .Values.workers.extraVolumeMounts | indent 12 }}
 {{- end }}
-{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
 {{ include "airflow_webserver_config_mount" . | indent 12 }}
 {{- end }}
           envFrom:
@@ -315,7 +315,7 @@ spec:
         - name: config
           configMap:
             name: {{ template "airflow_config" . }}
-        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigmapName }}
+        {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
         - name: webserver-config
           configMap:
             name: {{ template "airflow_webserver_config_configmap_name" . }}
diff --git a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
index b9e30dd21bc40..efc9a7e09002b 100644
--- a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
@@ -680,7 +680,7 @@ def perform_environment_checks():
     check_docker_is_running()
     check_docker_version()
     check_docker_compose_version()
-    check_docker_context()
+    # check_docker_context()
 
 
 def get_docker_syntax_version() -> str:

From 1c3c9373bcbdf363a89240b806a21b8ac662148e Mon Sep 17 00:00:00 2001
From: "Triomphe Jules, INI-DNA-INF" <jules.triomphe@swisscom.com>
Date: Sun, 4 Dec 2022 14:12:40 +0100
Subject: [PATCH 16/16] Revert unwanted comment in breeze's docker command
 utils

---
 dev/breeze/src/airflow_breeze/utils/docker_command_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
index efc9a7e09002b..b9e30dd21bc40 100644
--- a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
@@ -680,7 +680,7 @@ def perform_environment_checks():
     check_docker_is_running()
     check_docker_version()
     check_docker_compose_version()
-    # check_docker_context()
+    check_docker_context()
 
 
 def get_docker_syntax_version() -> str: