From 2f18adac057189d613603984d8ac4896b30758b8 Mon Sep 17 00:00:00 2001
From: Nicholas <49326743+N-ickJones@users.noreply.github.com>
Date: Fri, 17 Mar 2023 13:30:37 -0500
Subject: [PATCH 1/2] update values.yaml `config.kubernetes_executor`

For backwards compatibility of Airflow <= 2.5.0
keeps the existing values.yaml `config.kubernetes`
and add a new `config.kubernetes_executor` section.

values.yaml `config.kubernetes` deprecation in Airflow >= 2.5.0.
values.yaml `config.kubernetes` deprecation of `airflow_` entries.
---
 chart/values.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/chart/values.yaml b/chart/values.yaml
index e07b74c1df611..43365a80d8941 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1888,14 +1888,24 @@ config:
     ccache: '{{ .Values.kerberos.ccacheMountPath }}/{{ .Values.kerberos.ccacheFileName }}'
   celery_kubernetes_executor:
     kubernetes_queue: 'kubernetes'
+  # The `kubernetes` section is deprecated in Airflow >= 2.5.0 due to an airflow.cfg schema change. 
+  # The `kubernetes` section can be removed once the helm chart no longer supports Airflow < 2.5.0.
   kubernetes:
     namespace: '{{ .Release.Namespace }}'
+    # The following `airflow_` entries are for Airflow 1, and can be removed when it is no longer supported.
     airflow_configmap: '{{ include "airflow_config" . }}'
     airflow_local_settings_configmap: '{{ include "airflow_config" . }}'
     pod_template_file: '{{ include "airflow_pod_template_file" . }}/pod_template_file.yaml'
     worker_container_repository: '{{ .Values.images.airflow.repository | default .Values.defaultAirflowRepository }}'
     worker_container_tag: '{{ .Values.images.airflow.tag | default .Values.defaultAirflowTag }}'
     multi_namespace_mode: '{{ ternary "True" "False" .Values.multiNamespaceMode }}'
+  # The `kubernetes_executor` section duplicates the `kubernetes` section in Airflow >= 2.5.0 due to an airflow.cfg schema change.
+  kubernetes_executor:
+    namespace: '{{ .Release.Namespace }}'
+    pod_template_file: '{{ include "airflow_pod_template_file" . }}/pod_template_file.yaml'
+    worker_container_repository: '{{ .Values.images.airflow.repository | default .Values.defaultAirflowRepository }}'
+    worker_container_tag: '{{ .Values.images.airflow.tag | default .Values.defaultAirflowTag }}'
+    multi_namespace_mode: '{{ ternary "True" "False" .Values.multiNamespaceMode }}'
 # yamllint enable rule:line-length
 
 # Whether Airflow can launch workers and/or pods in multiple namespaces

From 609b8d5d4d39c674b3484934f9f2bc843f2ac847 Mon Sep 17 00:00:00 2001
From: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
Date: Fri, 17 Mar 2023 15:04:42 -0600
Subject: [PATCH 2/2] Update chart/values.yaml

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

diff --git a/chart/values.yaml b/chart/values.yaml
index 43365a80d8941..3a248285e4f9b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1888,7 +1888,7 @@ config:
     ccache: '{{ .Values.kerberos.ccacheMountPath }}/{{ .Values.kerberos.ccacheFileName }}'
   celery_kubernetes_executor:
     kubernetes_queue: 'kubernetes'
-  # The `kubernetes` section is deprecated in Airflow >= 2.5.0 due to an airflow.cfg schema change. 
+  # The `kubernetes` section is deprecated in Airflow >= 2.5.0 due to an airflow.cfg schema change.
   # The `kubernetes` section can be removed once the helm chart no longer supports Airflow < 2.5.0.
   kubernetes:
     namespace: '{{ .Release.Namespace }}'