Chart: Default airflow version to 2.4.1 (apache#26485)

Co-authored-by: Jed Cunningham <[email protected]>

chart/Chart.yaml

@@ -20,7 +20,7 @@
 apiVersion: v2
 name: airflow
 version: 1.7.0-dev
-appVersion: 2.3.4
+appVersion: 2.4.1
 description: The official Helm chart to deploy Apache Airflow, a platform to
   programmatically author, schedule, and monitor workflows
 home: https://airflow.apache.org/
@@ -46,23 +46,25 @@ annotations:
       url: https://airflow.apache.org/docs/helm-chart/1.6.0/
   artifacthub.io/screenshots: |
     - title: DAGs View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/dags.png
-    - title: Tree View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/grid.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/dags.png
+    - title: Datasets View
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/datasets.png
+    - title: Grid View
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/grid.png
     - title: Graph View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/graph.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/graph.png
     - title: Calendar View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/calendar.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/calendar.png
     - title: Variable View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/variable_hidden.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/variable_hidden.png
     - title: Gantt Chart
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/gantt.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/gantt.png
     - title: Task Duration
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/duration.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/duration.png
     - title: Code View
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/code.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/code.png
     - title: Task Instance Context Menu
-      url: https://airflow.apache.org/docs/apache-airflow/2.3.4/_images/context.png
+      url: https://airflow.apache.org/docs/apache-airflow/2.4.1/_images/context.png
   artifacthub.io/changes: |
     - description: Support ``annotations`` on ``volumeClaimTemplates``
       kind: added

chart/newsfragments/26485.significant.rst

@@ -0,0 +1,3 @@
+Default Airflow image is updated to ``2.4.1``
+
+The default Airflow image that is used with the Chart is now ``2.4.1``, previously it was ``2.3.2``.

chart/values.schema.json

@@ -77,13 +77,13 @@
         "defaultAirflowTag": {
             "description": "Default airflow tag to deploy.",
             "type": "string",
-            "default": "2.3.4",
+            "default": "2.4.1",
             "x-docsSection": "Common"
         },
         "airflowVersion": {
             "description": "Airflow version (Used to make some decisions based on Airflow Version being deployed).",
             "type": "string",
-            "default": "2.3.4",
+            "default": "2.4.1",
             "x-docsSection": "Common"
         },
         "securityContext": {

chart/values.yaml

@@ -49,10 +49,10 @@ airflowHome: /opt/airflow
 defaultAirflowRepository: apache/airflow
 
 # Default airflow tag to deploy
-defaultAirflowTag: "2.3.4"
+defaultAirflowTag: "2.4.1"
 
 # Airflow version (Used to make some decisions based on Airflow Version being deployed)
-airflowVersion: "2.3.4"
+airflowVersion: "2.4.1"
 
 # Images
 images:

tests/charts/test_airflow_common.py

@@ -243,7 +243,6 @@ def test_should_disable_some_variables(self):
                     "AIRFLOW__CORE__SQL_ALCHEMY_CONN": False,
                     "AIRFLOW__DATABASE__SQL_ALCHEMY_CONN": False,
                     "AIRFLOW__WEBSERVER__SECRET_KEY": False,
-                    "AIRFLOW__CELERY__RESULT_BACKEND": False,
                     "AIRFLOW__ELASTICSEARCH__HOST": False,
                 },
             },
@@ -258,7 +257,6 @@ def test_should_disable_some_variables(self):
         expected_vars = [
             'AIRFLOW__CORE__FERNET_KEY',
             'AIRFLOW_CONN_AIRFLOW_DB',
-            'AIRFLOW__CELERY__CELERY_RESULT_BACKEND',
             'AIRFLOW__CELERY__BROKER_URL',
         ]
         expected_vars_in_worker = ['DUMB_INIT_SETSID'] + expected_vars
@@ -286,8 +284,6 @@ def test_have_all_variables(self):
             'AIRFLOW__DATABASE__SQL_ALCHEMY_CONN',
             'AIRFLOW_CONN_AIRFLOW_DB',
             'AIRFLOW__WEBSERVER__SECRET_KEY',
-            'AIRFLOW__CELERY__CELERY_RESULT_BACKEND',
-            'AIRFLOW__CELERY__RESULT_BACKEND',
             'AIRFLOW__CELERY__BROKER_URL',
         ]
         expected_vars_in_worker = ['DUMB_INIT_SETSID'] + expected_vars

tests/charts/test_basic_helm_chart.py

@@ -37,8 +37,7 @@ def _get_values_with_version(self, values, version):
         return values
 
     def _get_object_count(self, version):
-        # TODO remove default from condition after airflow update
-        if version == "2.3.2" or version == "default":
+        if version == "2.3.2":
             return OBJECT_COUNT_IN_BASIC_DEPLOYMENT + 1
         return OBJECT_COUNT_IN_BASIC_DEPLOYMENT
 
@@ -61,8 +60,7 @@ def test_basic_deployments(self, version):
         list_of_kind_names_tuples = {
             (k8s_object['kind'], k8s_object['metadata']['name']) for k8s_object in k8s_objects
         }
-        # TODO remove default from condition after airflow update
-        if version == "2.3.2" or version == "default":
+        if version == "2.3.2":
             assert ('Secret', 'test-basic-airflow-result-backend') in list_of_kind_names_tuples
             list_of_kind_names_tuples.remove(('Secret', 'test-basic-airflow-result-backend'))
         assert list_of_kind_names_tuples == {
@@ -138,8 +136,7 @@ def test_basic_deployment_with_standalone_dag_processor(self, version):
         list_of_kind_names_tuples = {
             (k8s_object['kind'], k8s_object['metadata']['name']) for k8s_object in k8s_objects
         }
-        # TODO remove default from condition after airflow update
-        if version == "2.3.2" or version == "default":
+        if version == "2.3.2":
             assert ('Secret', 'test-basic-airflow-result-backend') in list_of_kind_names_tuples
             list_of_kind_names_tuples.remove(('Secret', 'test-basic-airflow-result-backend'))
         assert list_of_kind_names_tuples == {

tests/charts/test_rbac.py

@@ -113,8 +113,7 @@ def _get_values_with_version(self, values, version):
         return values
 
     def _get_object_count(self, version):
-        # TODO remove default from condition after airflow update
-        if version == "2.3.2" or version == "default":
+        if version == "2.3.2":
             return [
                 ('Secret', 'test-rbac-airflow-result-backend')
             ] + DEPLOYMENT_NO_RBAC_NO_SA_KIND_NAME_TUPLES

tests/charts/test_result_backend_connection_secret.py

@@ -32,8 +32,7 @@ def _get_values_with_version(self, values, version):
         return values
 
     def _assert_for_old_version(self, version, value, expected_value):
-        # TODO remove default from condition after airflow update
-        if version == "2.3.2" or version == "default":
+        if version == "2.3.2":
             assert value == expected_value
         else:
             assert value is None