Add workers.celery.tolerations & workers.kubernetes.tolerations

chart/files/pod-template-file.kubernetes-helm-yaml

@@ -19,7 +19,7 @@
 ---
 {{- $nodeSelector := or .Values.workers.kubernetes.nodeSelector .Values.workers.nodeSelector .Values.nodeSelector }}
 {{- $affinity := or .Values.workers.kubernetes.affinity .Values.workers.affinity .Values.affinity }}
-{{- $tolerations := or .Values.workers.tolerations .Values.tolerations }}
+{{- $tolerations := or .Values.workers.kubernetes.tolerations .Values.workers.tolerations .Values.tolerations }}
 {{- $topologySpreadConstraints := or .Values.workers.topologySpreadConstraints .Values.topologySpreadConstraints }}
 {{- $securityContext := include "airflowPodSecurityContext" (list .Values.workers.kubernetes .Values.workers .Values) }}
 {{- $containerSecurityContextKerberosSidecar := include "containerSecurityContext" (list .Values.workers.kubernetes.kerberosSidecar .Values.workers.kerberosSidecar .Values) }}

chart/newsfragments/64976.significant.rst

@@ -0,0 +1 @@
+``workers.tolerations`` field is now deprecated in favor of ``workers.celery.tolerations`` and ``workers.kubernetes.tolerations``. Please update your configuration accordingly.

chart/templates/NOTES.txt

@@ -741,6 +741,14 @@ DEPRECATION WARNING:
 
 {{- end }}
 
+{{- if not (empty .Values.workers.tolerations) }}
+
+ DEPRECATION WARNING:
+    `workers.tolerations` has been renamed to `workers.celery.tolerations`/`workers.kubernetes.tolerations`.
+    Please change your values as support for the old name will be dropped in a future release.
+
+{{- end }}
+
 {{- if not (empty .Values.workers.nodeSelector) }}
 
  DEPRECATION WARNING:

chart/values.schema.json

@@ -2363,7 +2363,7 @@
                     "$ref": "#/definitions/io.k8s.api.core.v1.Affinity"
                 },
                 "tolerations": {
-                    "description": "Specify Tolerations for Airflow Celery worker pods and pods created with pod-template-file.",
+                    "description": "Specify Tolerations for Airflow Celery worker pods and pods created with pod-template-file (deprecated, use ``workers.celery.tolerations`` and/or ``workers.kubernetes.tolerations`` instead).",
                     "type": "array",
                     "default": [],
                     "items": {
@@ -3442,6 +3442,15 @@
                             "default": {},
                             "$ref": "#/definitions/io.k8s.api.core.v1.Affinity"
                         },
+                        "tolerations": {
+                            "description": "Specify Tolerations for Airflow Celery worker pods.",
+                            "type": "array",
+                            "default": [],
+                            "items": {
+                                "type": "object",
+                                "$ref": "#/definitions/io.k8s.api.core.v1.Toleration"
+                            }
+                        },
                         "hostAliases": {
                             "description": "Specify HostAliases for Airflow Celery worker pods.",
                             "items": {
@@ -3948,6 +3957,15 @@
                             "default": {},
                             "$ref": "#/definitions/io.k8s.api.core.v1.Affinity"
                         },
+                        "tolerations": {
+                            "description": "Specify Tolerations for pods created with pod-template-file.",
+                            "type": "array",
+                            "default": [],
+                            "items": {
+                                "type": "object",
+                                "$ref": "#/definitions/io.k8s.api.core.v1.Toleration"
+                            }
+                        },
                         "hostAliases": {
                             "description": "Specify HostAliases for pods created with pod-template-file.",
                             "items": {

chart/values.yaml

@@ -1105,7 +1105,9 @@ workers:
   #        topologyKey: kubernetes.io/hostname
   #      weight: 100
 
+  # (deprecated, use `workers.celery.tolerations` and/or `workers.kubernetes.tolerations` instead)
   tolerations: []
+
   topologySpreadConstraints: []
 
   # hostAliases to use in Airflow Celery worker pods and pods created with pod-template-file
@@ -1492,6 +1494,8 @@ workers:
     #        topologyKey: kubernetes.io/hostname
     #      weight: 100
 
+    tolerations: []
+
     # hostAliases to use in Airflow Celery worker pods
     # See:
     # https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
@@ -1660,6 +1664,8 @@ workers:
 
     affinity: {}
 
+    tolerations: []
+
     # hostAliases to use in pods created with pod-template-file
     # See:
     # https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/

helm-tests/tests/helm_tests/airflow_aux/test_pod_template_file.py

@@ -554,16 +554,37 @@ def test_workers_affinity(self, workers_values):
             }
         }
 
-    def test_workers_tolerations(self):
-        docs = render_chart(
-            values={
-                "executor": "KubernetesExecutor",
-                "workers": {
+    @pytest.mark.parametrize(
+        "workers_values",
+        [
+            {
+                "tolerations": [
+                    {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
+                ],
+            },
+            {
+                "kubernetes": {
                     "tolerations": [
                         {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
-                    ],
+                    ]
+                },
+            },
+            {
+                "tolerations": [{"key": "pods", "operator": "Exists", "effect": "PreferNoSchedule"}],
+                "kubernetes": {
+                    "tolerations": [
+                        {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
+                    ]
                 },
             },
+        ],
+    )
+    def test_workers_tolerations(self, workers_values):
+        docs = render_chart(
+            values={
+                "executor": "KubernetesExecutor",
+                "workers": workers_values,
+            },
             show_only=["templates/pod-template-file.yaml"],
             chart_dir=self.temp_chart_dir,
         )

helm-tests/tests/helm_tests/airflow_core/test_worker.py

@@ -667,16 +667,37 @@ def test_affinity(self, workers_values):
             }
         }
 
-    def test_tolerations(self):
-        docs = render_chart(
-            values={
-                "executor": "CeleryExecutor",
-                "workers": {
+    @pytest.mark.parametrize(
+        "workers_values",
+        [
+            {
+                "tolerations": [
+                    {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
+                ],
+            },
+            {
+                "celery": {
                     "tolerations": [
                         {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
-                    ],
+                    ]
                 },
             },
+            {
+                "tolerations": [{"key": "pods", "operator": "Exists", "effect": "PreferNoSchedule"}],
+                "celery": {
+                    "tolerations": [
+                        {"key": "dynamic-pods", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
+                    ]
+                },
+            },
+        ],
+    )
+    def test_tolerations(self, workers_values):
+        docs = render_chart(
+            values={
+                "executor": "CeleryExecutor",
+                "workers": workers_values,
+            },
             show_only=["templates/workers/worker-deployment.yaml"],
         )
 

helm-tests/tests/helm_tests/airflow_core/test_worker_sets.py

@@ -2923,6 +2923,27 @@ def test_overwrite_affinity(self, workers_values):
                     ],
                 },
             },
+            {
+                "celery": {
+                    "enableDefault": False,
+                    "tolerations": [
+                        {"key": "not-me", "operator": "Equal", "value": "true", "effect": "NoSchedule"}
+                    ],
+                    "sets": [
+                        {
+                            "name": "set1",
+                            "tolerations": [
+                                {
+                                    "key": "dynamic-pods",
+                                    "operator": "Equal",
+                                    "value": "true",
+                                    "effect": "NoSchedule",
+                                }
+                            ],
+                        }
+                    ],
+                },
+            },
         ],
     )
     def test_overwrite_tolerations(self, workers_values):