You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by je...@apache.org on 2022/10/06 00:03:04 UTC
[airflow] branch main updated: Chart: Default airflow version to 2.4.1 (#26485)
This is an automated email from the ASF dual-hosted git repository.
jedcunningham pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new ed2515c656 Chart: Default airflow version to 2.4.1 (#26485)
ed2515c656 is described below
commit ed2515c656648c605fe3ebcdde6b88b8a629d6da
Author: Ephraim Anierobi <sp...@gmail.com>
AuthorDate: Thu Oct 6 01:02:55 2022 +0100
Chart: Default airflow version to 2.4.1 (#26485)
Co-authored-by: Jed Cunningham <je...@apache.org>
---
chart/Chart.yaml | 24 ++++++++++++----------
chart/newsfragments/25916.significant.rst | 3 ---
chart/newsfragments/26485.significant.rst | 3 +++
chart/values.schema.json | 4 ++--
chart/values.yaml | 4 ++--
tests/charts/test_airflow_common.py | 4 ----
tests/charts/test_basic_helm_chart.py | 9 +++-----
tests/charts/test_rbac.py | 3 +--
.../test_result_backend_connection_secret.py | 3 +--
9 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 457feb3b22..760b3891fa 100644
--- a/chart/Chart.yaml
+++ b/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
diff --git a/chart/newsfragments/25916.significant.rst b/chart/newsfragments/25916.significant.rst
deleted file mode 100644
index ba10ddf912..0000000000
--- a/chart/newsfragments/25916.significant.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Default Airflow image is updated to ``2.3.4``
-
-The default Airflow image that is used with the Chart is now ``2.3.4``, previously it was ``2.3.2``.
diff --git a/chart/newsfragments/26485.significant.rst b/chart/newsfragments/26485.significant.rst
new file mode 100644
index 0000000000..3ec4fcd40b
--- /dev/null
+++ b/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``.
diff --git a/chart/values.schema.json b/chart/values.schema.json
index 7e25df67f7..444ffc1c24 100644
--- a/chart/values.schema.json
+++ b/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": {
diff --git a/chart/values.yaml b/chart/values.yaml
index afe35b00c4..84816b5a3a 100644
--- a/chart/values.yaml
+++ b/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:
diff --git a/tests/charts/test_airflow_common.py b/tests/charts/test_airflow_common.py
index 1577df2037..a8e5665316 100644
--- a/tests/charts/test_airflow_common.py
+++ b/tests/charts/test_airflow_common.py
@@ -243,7 +243,6 @@ class TestAirflowCommon:
"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 @@ class TestAirflowCommon:
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 @@ class TestAirflowCommon:
'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
diff --git a/tests/charts/test_basic_helm_chart.py b/tests/charts/test_basic_helm_chart.py
index e1acb9a284..fbaab4d17f 100644
--- a/tests/charts/test_basic_helm_chart.py
+++ b/tests/charts/test_basic_helm_chart.py
@@ -37,8 +37,7 @@ class TestBaseChartTest(unittest.TestCase):
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 @@ class TestBaseChartTest(unittest.TestCase):
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 @@ class TestBaseChartTest(unittest.TestCase):
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 == {
diff --git a/tests/charts/test_rbac.py b/tests/charts/test_rbac.py
index 488bc2b6c8..08a62781ea 100644
--- a/tests/charts/test_rbac.py
+++ b/tests/charts/test_rbac.py
@@ -113,8 +113,7 @@ class RBACTest(unittest.TestCase):
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
diff --git a/tests/charts/test_result_backend_connection_secret.py b/tests/charts/test_result_backend_connection_secret.py
index 1c31faacb4..a6bd2e2555 100644
--- a/tests/charts/test_result_backend_connection_secret.py
+++ b/tests/charts/test_result_backend_connection_secret.py
@@ -32,8 +32,7 @@ class ResultBackendConnectionSecretTest(unittest.TestCase):
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