From f7aaeb370b2701f251c0fd95dde096824129d206 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:21:44 +0200 Subject: [PATCH 1/4] Update tests and examples with Airflow 2.4.1 --- CHANGELOG.md | 2 ++ docs/modules/ROOT/partials/supported-versions.adoc | 1 + examples/pvc-airflow.yaml | 6 +++--- examples/simple-airflow-cluster-dags-cmap.yaml | 2 +- examples/simple-airflow-cluster-ldap-insecure-tls.yaml | 2 +- examples/simple-airflow-cluster-ldap.yaml | 2 +- .../{02-deps-volume.yaml => 02-deps-volume.yaml.j2} | 2 +- tests/test-definition.yaml | 1 + 8 files changed, 11 insertions(+), 7 deletions(-) rename tests/templates/kuttl/mount-dags-pvc/{02-deps-volume.yaml => 02-deps-volume.yaml.j2} (90%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1008b44..4a042f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Cpu and memory limits are now configurable ([#167]). - Stale resources are now deleted ([#174]). +- Support for Airflow 2.4.1 ([#xxx]). ### Changed @@ -15,6 +16,7 @@ [#167]: https://github.com/stackabletech/airflow-operator/pull/167 [#171]: https://github.com/stackabletech/airflow-operator/pull/171 [#174]: https://github.com/stackabletech/airflow-operator/pull/174 +[#xxx]: https://github.com/stackabletech/airflow-operator/pull/xxx ## [0.5.0] - 2022-09-06 diff --git a/docs/modules/ROOT/partials/supported-versions.adoc b/docs/modules/ROOT/partials/supported-versions.adoc index 6d7e7380..e7358933 100644 --- a/docs/modules/ROOT/partials/supported-versions.adoc +++ b/docs/modules/ROOT/partials/supported-versions.adoc @@ -5,3 +5,4 @@ - 2.2.3 - 2.2.4 - 2.2.5 +- 2.4.1 diff --git a/examples/pvc-airflow.yaml b/examples/pvc-airflow.yaml index 8f81f04d..7824be28 100644 --- a/examples/pvc-airflow.yaml +++ b/examples/pvc-airflow.yaml @@ -51,11 +51,11 @@ spec: "bash", "-x", "-c", - "curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_bash_operator.py \ + "curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_bash_operator.py \ -o ${DEST_DIR}/example_bash_operator.py && \ - curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_complex.py \ + curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_complex.py \ -o ${DEST_DIR}/example_complex.py && \ - curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_branch_datetime_operator.py \ + curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_branch_datetime_operator.py \ -o ${DEST_DIR}/example_branch_datetime_operator.py", ] volumeMounts: diff --git a/examples/simple-airflow-cluster-dags-cmap.yaml b/examples/simple-airflow-cluster-dags-cmap.yaml index 55081312..fe635dfb 100644 --- a/examples/simple-airflow-cluster-dags-cmap.yaml +++ b/examples/simple-airflow-cluster-dags-cmap.yaml @@ -80,7 +80,7 @@ kind: AirflowCluster metadata: name: airflow-dags-cmap spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 statsdExporterVersion: v0.22.4 executor: CeleryExecutor loadExamples: false diff --git a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml index c198dd93..b2476421 100644 --- a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml +++ b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml @@ -146,7 +146,7 @@ kind: AirflowCluster metadata: name: airflow-insecure-tls spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 statsdExporterVersion: v0.22.4 executor: CeleryExecutor loadExamples: true diff --git a/examples/simple-airflow-cluster-ldap.yaml b/examples/simple-airflow-cluster-ldap.yaml index 7874fb32..0e7cc696 100644 --- a/examples/simple-airflow-cluster-ldap.yaml +++ b/examples/simple-airflow-cluster-ldap.yaml @@ -144,7 +144,7 @@ kind: AirflowCluster metadata: name: airflow-with-ldap-server-veri-tls spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 statsdExporterVersion: v0.22.4 executor: CeleryExecutor loadExamples: true diff --git a/tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml b/tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml.j2 similarity index 90% rename from tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml rename to tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml.j2 index dee28db6..f394201d 100644 --- a/tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml +++ b/tests/templates/kuttl/mount-dags-pvc/02-deps-volume.yaml.j2 @@ -38,7 +38,7 @@ spec: "bash", "-x", "-c", - "curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_trigger_target_dag.py \ + "curl -L https://raw.githubusercontent.com/apache/airflow/{{ test_scenario['values']['airflow'].split('-').0 }}/airflow/example_dags/example_trigger_target_dag.py \ -o ${DEST_DIR}/example_trigger_target_dag.py", ] volumeMounts: diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 6568c164..766f8e0a 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -14,6 +14,7 @@ dimensions: - 2.2.3-python38-stackable0.3.0 - 2.2.4-python39-stackable0.3.0 - 2.2.5-python39-stackable0.3.0 + - 2.4.1-stackable0.4.0 - name: ldap-authentication values: - no-tls From ec5c39d590965b466c9fdc3258380a0c4ccd1085 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:26:10 +0200 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a042f12..11614c65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Cpu and memory limits are now configurable ([#167]). - Stale resources are now deleted ([#174]). -- Support for Airflow 2.4.1 ([#xxx]). +- Support for Airflow 2.4.1 ([#179]). ### Changed @@ -16,7 +16,7 @@ [#167]: https://github.com/stackabletech/airflow-operator/pull/167 [#171]: https://github.com/stackabletech/airflow-operator/pull/171 [#174]: https://github.com/stackabletech/airflow-operator/pull/174 -[#xxx]: https://github.com/stackabletech/airflow-operator/pull/xxx +[#179]: https://github.com/stackabletech/airflow-operator/pull/179 ## [0.5.0] - 2022-09-06 From 21eb518432f1632b51ec3e2433cc2122f7b44c51 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:32:09 +0200 Subject: [PATCH 3/4] Update docs to Airflow 2.4.1 --- .../ROOT/examples/example-airflow-dags-configmap.yaml | 2 +- docs/modules/ROOT/examples/example-pvc.yaml | 6 +++--- docs/modules/ROOT/pages/usage.adoc | 2 +- docs/modules/getting_started/examples/code/airflow.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/modules/ROOT/examples/example-airflow-dags-configmap.yaml b/docs/modules/ROOT/examples/example-airflow-dags-configmap.yaml index 4d9e0a3f..464fc3af 100644 --- a/docs/modules/ROOT/examples/example-airflow-dags-configmap.yaml +++ b/docs/modules/ROOT/examples/example-airflow-dags-configmap.yaml @@ -4,7 +4,7 @@ kind: AirflowCluster metadata: name: airflow spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 statsdExporterVersion: v0.22.4 executor: CeleryExecutor loadExamples: false diff --git a/docs/modules/ROOT/examples/example-pvc.yaml b/docs/modules/ROOT/examples/example-pvc.yaml index 63a89be5..13dfd03e 100644 --- a/docs/modules/ROOT/examples/example-pvc.yaml +++ b/docs/modules/ROOT/examples/example-pvc.yaml @@ -51,11 +51,11 @@ spec: "bash", "-x", "-c", - "curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_bash_operator.py \ + "curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_bash_operator.py \ -o ${DEST_DIR}/example_bash_operator.py && \ - curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_complex.py \ + curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_complex.py \ -o ${DEST_DIR}/example_complex.py && \ - curl -L https://raw.githubusercontent.com/apache/airflow/2.2.5/airflow/example_dags/example_branch_datetime_operator.py \ + curl -L https://raw.githubusercontent.com/apache/airflow/2.4.1/airflow/example_dags/example_branch_datetime_operator.py \ -o ${DEST_DIR}/example_branch_datetime_operator.py", ] volumeMounts: diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc index b213d04d..a8c3c69e 100644 --- a/docs/modules/ROOT/pages/usage.adoc +++ b/docs/modules/ROOT/pages/usage.adoc @@ -125,7 +125,7 @@ kind: AirflowCluster metadata: name: airflow-with-ldap spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 [...] authenticationConfig: authenticationClass: airflow-with-ldap-ldap diff --git a/docs/modules/getting_started/examples/code/airflow.yaml b/docs/modules/getting_started/examples/code/airflow.yaml index 9f9214b3..1d8a7c44 100644 --- a/docs/modules/getting_started/examples/code/airflow.yaml +++ b/docs/modules/getting_started/examples/code/airflow.yaml @@ -4,7 +4,7 @@ kind: AirflowCluster metadata: name: airflow spec: - version: 2.2.5-python39-stackable0.3.0 + version: 2.4.1-stackable0.4.0 statsdExporterVersion: v0.22.4 executor: CeleryExecutor loadExamples: true From 9e8ac22074ebb6fabd831d888b8aab5c2dcea05b Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Thu, 13 Oct 2022 12:09:04 +0200 Subject: [PATCH 4/4] Remove oldest version from test definitions. --- tests/test-definition.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 766f8e0a..6806cb8a 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -11,7 +11,6 @@ dimensions: - name: airflow values: - - 2.2.3-python38-stackable0.3.0 - 2.2.4-python39-stackable0.3.0 - 2.2.5-python39-stackable0.3.0 - 2.4.1-stackable0.4.0