[chart/v1-2x-test] Add workers.celery.extraPorts (#61919)

chart/newsfragments/61919.significant.rst

@@ -0,0 +1 @@
+``workers.extraPorts`` section is now deprecated in favor of ``workers.celery.extraPorts``. Please update your configuration accordingly.

chart/templates/NOTES.txt

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

chart/values.schema.json

@@ -2309,7 +2309,7 @@
                     }
                 },
                 "extraPorts": {
-                    "description": "Expose additional ports of Airflow Celery worker container.",
+                    "description": "Expose additional ports of Airflow Celery worker container (deprecated, use `workers.celery.extraPorts` instead).",
                     "type": "array",
                     "default": [],
                     "items": {
@@ -3294,6 +3294,14 @@
                             ],
                             "default": null
                         },
+                        "extraPorts": {
+                            "description": "Expose additional ports of Airflow Celery worker container.",
+                            "type": "array",
+                            "default": [],
+                            "items": {
+                                "$ref": "#/definitions/io.k8s.api.core.v1.ContainerPort"
+                            }
+                        },
                         "nodeSelector": {
                             "description": "Select certain nodes for Airflow Celery worker pods.",
                             "type": "object",

chart/values.yaml

@@ -1055,6 +1055,7 @@ workers:
   #       readOnly: true
 
   # Expose additional ports of Airflow Celery workers. These can be used for additional metric collection.
+  # (deprecated, use workers.celery.extraPorts instead)
   extraPorts: []
 
   # Select certain nodes for Airflow Celery worker pods and pods created with pod-template-file
@@ -1383,6 +1384,9 @@ workers:
     # This setting tells kubernetes that its ok to evict when it wants to scale a node down
     safeToEvict: ~
 
+    # Expose additional ports of Airflow Celery workers. These can be used for additional metric collection.
+    extraPorts: []
+
     # Select certain nodes for Airflow Celery worker pods
     nodeSelector: {}
 

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

@@ -1920,6 +1920,27 @@ def test_termination_grace_period(self, workers_values):
 
         assert jmespath.search("spec.template.spec.terminationGracePeriodSeconds", docs[0]) == 5
 
+    @pytest.mark.parametrize(
+        "workers_values",
+        [
+            {"extraPorts": [{"name": "test-extra-port", "containerPort": 10}]},
+            {"celery": {"extraPorts": [{"name": "test-extra-port", "containerPort": 10}]}},
+            {
+                "extraPorts": [{"name": "test", "containerPort": 1}],
+                "celery": {"extraPorts": [{"name": "test-extra-port", "containerPort": 10}]},
+            },
+        ],
+    )
+    def test_overwrite_extra_ports(self, workers_values):
+        docs = render_chart(
+            values={"workers": workers_values},
+            show_only=["templates/workers/worker-deployment.yaml"],
+        )
+
+        assert jmespath.search("spec.template.spec.containers[0].ports[:-1]", docs[0]) == [
+            {"name": "test-extra-port", "containerPort": 10}
+        ]
+
 
 class TestWorkerLogGroomer(LogGroomerTestBase):
     """Worker groomer."""

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

@@ -2430,6 +2430,13 @@ def test_overwrite_extra_volume_mounts(self, workers_values):
                 "extraPorts": [{"name": "test-extra-port", "containerPort": 10}],
                 "celery": {"enableDefault": False, "sets": [{"name": "set1"}]},
             },
+            {
+                "celery": {
+                    "extraPorts": [{"name": "test-extra-port", "containerPort": 10}],
+                    "enableDefault": False,
+                    "sets": [{"name": "set1"}],
+                },
+            },
             {
                 "extraPorts": [{"name": "test", "containerPort": 1}],
                 "celery": {
@@ -2439,6 +2446,15 @@ def test_overwrite_extra_volume_mounts(self, workers_values):
                     ],
                 },
             },
+            {
+                "celery": {
+                    "extraPorts": [{"name": "test", "containerPort": 1}],
+                    "enableDefault": False,
+                    "sets": [
+                        {"name": "set1", "extraPorts": [{"name": "test-extra-port", "containerPort": 10}]}
+                    ],
+                },
+            },
         ],
     )
     def test_overwrite_extra_ports(self, workers_values):