From 4a2a5b2268768b72f67ea7ab4c053ace1019930c Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 20 Oct 2023 15:04:13 +0200 Subject: [PATCH] New airflow version 2.6.3, 2.7.2 (#334) * adapt supported versions * bump docs and examples to 2.7.1 * fix python imports to be compatible with 2.7.1 * adapted changelog * use 2.7.2 instead of 2.7.1 * bump operator-rs to 0.55.0 * mention vector and operator-rs bumps * increase memory of scheudler * increase celery worker memory for testing * remove extra resources and use 2 celery workers * use 1 worker and increase memory * fix tests * remove pullpolicy * remove pullpolicy * improve comment in test --- CHANGELOG.md | 10 +- Cargo.lock | 8 +- Cargo.toml | 2 +- deploy/helm/airflow-operator/crds/crds.yaml | 112 +++++++++++++----- .../example-airflow-dags-configmap.yaml | 2 +- .../examples/example-airflow-gitsync.yaml | 2 +- .../examples/example-airflow-incluster.yaml | 2 +- .../getting_started/code/airflow.yaml | 2 +- .../airflow/pages/usage-guide/security.adoc | 2 +- .../airflow/partials/supported-versions.adoc | 8 +- .../simple-airflow-cluster-dags-cmap.yaml | 2 +- ...ple-airflow-cluster-ldap-insecure-tls.yaml | 2 +- examples/simple-airflow-cluster-ldap.yaml | 2 +- examples/simple-airflow-cluster.yaml | 2 +- rust/crd/src/affinity.rs | 4 +- rust/crd/src/git_sync.rs | 6 +- rust/crd/src/lib.rs | 4 +- .../operator-binary/src/airflow_controller.rs | 2 +- rust/operator-binary/src/config.rs | 2 +- .../ldap/06-install-airflow-cluster.yaml.j2 | 5 + tests/test-definition.yaml | 7 +- 21 files changed, 126 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afe2dcfa..408ff968 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,13 @@ - [BREAKING] Implement KubernetesExecutor ([#311]). - Default stackableVersion to operator version ([#312]). - Support PodDisruptionBudgets ([#330]). +- Added support for versions 2.6.3, 2.7.2 ([#334]). ### Changed - [BREAKING] Consolidated `spec.clusterConfig.authenticationConfig` to `spec.clusterConfig.authentication` which now takes a vector of AuthenticationClass references ([#303]). -- `vector` `0.26.0` -> `0.31.0` ([#308]). -- `operator-rs` `0.44.0` -> `0.52.1` ([#308], [#330]). +- `vector` `0.26.0` -> `0.33.0` ([#308], [#334]). +- `operator-rs` `0.44.0` -> `0.55.0` ([#308], [#330], [#334]). - [BREAKING] Removed AirflowDB object, since it created some problems when reinstalling or upgrading an Airflow cluster. Instead, the initialization of the database was moved to the startup phase of each scheduler pod. To make sure the initialization does not run in parallel, the `PodManagementPolicy` of the scheduler StatefulSet was set to `OrderedReady`. The `.spec.clusterConfig.databaseInitialization` option was removed from the CRD, since it was just there to enable logging for the database initialization Job, which doesn't exist anymore ([#322]). ### Fixed @@ -20,12 +21,17 @@ - BREAKING: Rename Service port name from `airflow` to `http` for consistency reasons. This change should normally not be breaking, as we only change the name, not the port. However, there might be some e.g. Ingresses that rely on the port name and need to be updated ([#316]). - Fix user-supplied gitsync git-config settings ([#335]). +### Removed + +- Removed support for 2.2.3, 2.2.4, 2.2.5, 2.4.1 ([#334]). + [#303]: https://github.com/stackabletech/airflow-operator/pull/303 [#308]: https://github.com/stackabletech/airflow-operator/pull/308 [#311]: https://github.com/stackabletech/airflow-operator/pull/311 [#312]: https://github.com/stackabletech/airflow-operator/pull/312 [#316]: https://github.com/stackabletech/airflow-operator/pull/316 [#330]: https://github.com/stackabletech/airflow-operator/pull/330 +[#334]: https://github.com/stackabletech/airflow-operator/pull/334 [#335]: https://github.com/stackabletech/airflow-operator/pull/335 ## [23.7.0] - 2023-07-14 diff --git a/Cargo.lock b/Cargo.lock index 84ed0553..54be2875 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1865,8 +1865,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.52.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.52.1#18af9be0473cd6c30d7426e9ade74c90e4abce22" +version = "0.55.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.55.0#bfbc23d3819f815413cb4135e0835acd76aecf97" dependencies = [ "chrono", "clap", @@ -1899,8 +1899,8 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.52.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.52.1#18af9be0473cd6c30d7426e9ade74c90e4abce22" +version = "0.55.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.55.0#bfbc23d3819f815413cb4135e0835acd76aecf97" dependencies = [ "darling 0.20.3", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index e16f62b4..035b0985 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.7" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.52.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" } strum = { version = "0.25", features = ["derive"] } tokio = { version = "1.29", features = ["full"] } tracing = "0.1" diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml index 69389516..62ab71d6 100644 --- a/deploy/helm/airflow-operator/crds/crds.yaml +++ b/deploy/helm/airflow-operator/crds/crds.yaml @@ -515,6 +515,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -522,13 +523,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -544,14 +546,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -565,9 +569,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -580,10 +585,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -3945,6 +3953,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -3952,13 +3961,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -3974,14 +3984,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -3995,9 +4007,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -4010,10 +4023,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -8181,6 +8197,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -8188,13 +8205,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -8210,14 +8228,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -8231,9 +8251,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -8246,10 +8267,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -11588,6 +11612,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -11595,13 +11620,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -11617,14 +11643,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -11638,9 +11666,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -11653,10 +11682,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -15018,6 +15050,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -15025,13 +15058,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -15047,14 +15081,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -15068,9 +15104,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -15083,10 +15120,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -18465,6 +18505,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -18472,13 +18513,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -18494,14 +18536,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -18515,9 +18559,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -18530,10 +18575,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -21895,6 +21943,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -21902,13 +21951,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -21924,14 +21974,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -21945,9 +21997,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -21960,10 +22013,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object diff --git a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml index b4263407..e9aafc61 100644 --- a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml +++ b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml @@ -5,7 +5,7 @@ metadata: name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: false exposeConfig: false diff --git a/docs/modules/airflow/examples/example-airflow-gitsync.yaml b/docs/modules/airflow/examples/example-airflow-gitsync.yaml index d1d8ec45..1f0b8f37 100644 --- a/docs/modules/airflow/examples/example-airflow-gitsync.yaml +++ b/docs/modules/airflow/examples/example-airflow-gitsync.yaml @@ -5,7 +5,7 @@ metadata: name: airflow spec: image: - productVersion: "2.6.1" + productVersion: "2.7.2" clusterConfig: loadExamples: false exposeConfig: false diff --git a/docs/modules/airflow/examples/example-airflow-incluster.yaml b/docs/modules/airflow/examples/example-airflow-incluster.yaml index b0ed460f..1692cd22 100644 --- a/docs/modules/airflow/examples/example-airflow-incluster.yaml +++ b/docs/modules/airflow/examples/example-airflow-incluster.yaml @@ -5,7 +5,7 @@ metadata: name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: false exposeConfig: false diff --git a/docs/modules/airflow/examples/getting_started/code/airflow.yaml b/docs/modules/airflow/examples/getting_started/code/airflow.yaml index c947b9bd..95f21ab1 100644 --- a/docs/modules/airflow/examples/getting_started/code/airflow.yaml +++ b/docs/modules/airflow/examples/getting_started/code/airflow.yaml @@ -5,7 +5,7 @@ metadata: name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: true exposeConfig: false diff --git a/docs/modules/airflow/pages/usage-guide/security.adoc b/docs/modules/airflow/pages/usage-guide/security.adoc index f30d8825..fd3f6b7e 100644 --- a/docs/modules/airflow/pages/usage-guide/security.adoc +++ b/docs/modules/airflow/pages/usage-guide/security.adoc @@ -23,7 +23,7 @@ metadata: name: airflow-with-ldap spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: authentication: - authenticationClass: ldap # <1> diff --git a/docs/modules/airflow/partials/supported-versions.adoc b/docs/modules/airflow/partials/supported-versions.adoc index 30ca969d..3a226012 100644 --- a/docs/modules/airflow/partials/supported-versions.adoc +++ b/docs/modules/airflow/partials/supported-versions.adoc @@ -2,8 +2,6 @@ // This is a separate file, since it is used by both the direct Airflow-Operator documentation, and the overarching // Stackable Platform documentation. -- 2.2.3 -- 2.2.4 -- 2.2.5 -- 2.4.1 -- 2.6.1 +- 2.7.2 +- 2.6.3 +- 2.6.1 (deprecated) diff --git a/examples/simple-airflow-cluster-dags-cmap.yaml b/examples/simple-airflow-cluster-dags-cmap.yaml index 9f92cc53..e4b11e0e 100644 --- a/examples/simple-airflow-cluster-dags-cmap.yaml +++ b/examples/simple-airflow-cluster-dags-cmap.yaml @@ -81,7 +81,7 @@ metadata: name: airflow-dags-cmap spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 stackableVersion: 0.0.0-dev clusterConfig: loadExamples: false diff --git a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml index 1af4f787..11953f63 100644 --- a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml +++ b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml @@ -147,7 +147,7 @@ metadata: name: airflow-insecure-tls spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 stackableVersion: 0.0.0-dev clusterConfig: loadExamples: true diff --git a/examples/simple-airflow-cluster-ldap.yaml b/examples/simple-airflow-cluster-ldap.yaml index e1a998fc..8afa2bb9 100644 --- a/examples/simple-airflow-cluster-ldap.yaml +++ b/examples/simple-airflow-cluster-ldap.yaml @@ -145,7 +145,7 @@ metadata: name: airflow-with-ldap-server-veri-tls spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 stackableVersion: 0.0.0-dev clusterConfig: loadExamples: true diff --git a/examples/simple-airflow-cluster.yaml b/examples/simple-airflow-cluster.yaml index 28ef03b6..c18aa7cd 100644 --- a/examples/simple-airflow-cluster.yaml +++ b/examples/simple-airflow-cluster.yaml @@ -21,7 +21,7 @@ metadata: name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 stackableVersion: 0.0.0-dev clusterConfig: loadExamples: true diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index b716b156..07ba44c2 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -62,7 +62,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 loadExamples: true exposeConfig: false credentialsSecret: simple-airflow-credentials @@ -159,7 +159,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 loadExamples: true exposeConfig: false credentialsSecret: simple-airflow-credentials diff --git a/rust/crd/src/git_sync.rs b/rust/crd/src/git_sync.rs index 111174a4..9170277b 100644 --- a/rust/crd/src/git_sync.rs +++ b/rust/crd/src/git_sync.rs @@ -70,7 +70,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: false exposeConfig: false @@ -116,7 +116,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: false exposeConfig: false @@ -189,7 +189,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: false exposeConfig: false diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 43d8c12c..005fc7f0 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -713,7 +713,7 @@ mod tests { name: airflow spec: image: - productVersion: 2.6.1 + productVersion: 2.7.2 clusterConfig: loadExamples: true exposeConfig: true @@ -737,7 +737,7 @@ mod tests { let resolved_airflow_image: ResolvedProductImage = cluster.spec.image.resolve("airflow", "0.0.0-dev"); - assert_eq!("2.6.1", &resolved_airflow_image.product_version); + assert_eq!("2.7.2", &resolved_airflow_image.product_version); assert_eq!("KubernetesExecutor", cluster.spec.executor.to_string()); assert!(cluster.spec.cluster_config.load_examples.unwrap_or(false)); diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs index c38d7e15..fc8842e3 100644 --- a/rust/operator-binary/src/airflow_controller.rs +++ b/rust/operator-binary/src/airflow_controller.rs @@ -41,7 +41,6 @@ use stackable_operator::{ product_image_selection::ResolvedProductImage, rbac::build_rbac_resources, }, - duration::Duration, k8s_openapi::{ api::{ apps::v1::{StatefulSet, StatefulSetSpec}, @@ -69,6 +68,7 @@ use stackable_operator::{ compute_conditions, operations::ClusterOperationsConditionBuilder, statefulset::StatefulSetConditionBuilder, }, + time::Duration, }; use std::{ collections::{BTreeMap, HashMap}, diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs index f4465e09..e237edd1 100644 --- a/rust/operator-binary/src/config.rs +++ b/rust/operator-binary/src/config.rs @@ -9,7 +9,7 @@ use std::collections::BTreeMap; pub const PYTHON_IMPORTS: &[&str] = &[ "import os", - "from airflow.www.fab_security.manager import (AUTH_DB, AUTH_LDAP, AUTH_OAUTH, AUTH_OID, AUTH_REMOTE_USER)", + "from flask_appbuilder.const import (AUTH_DB, AUTH_LDAP, AUTH_OAUTH, AUTH_OID, AUTH_REMOTE_USER)", "basedir = os.path.abspath(os.path.dirname(__file__))", "WTF_CSRF_ENABLED = True", ]; diff --git a/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2 index 23951ff9..e6d71954 100644 --- a/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2 @@ -69,6 +69,11 @@ commands: config: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} + # There are some OOM kill events when using celery executor with the default (currently 1.75Gi) + # resources and version 2.7.2, so we provide more memory here. + resources: + memory: + limit: '2.5Gi' roleGroups: default: replicas: 1 diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 3bc55268..3b55c964 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -7,13 +7,12 @@ dimensions: - name: airflow values: - - 2.2.4 - - 2.2.5 - - 2.4.1 - 2.6.1 + - 2.6.3 + - 2.7.2 - name: airflow-latest values: - - 2.6.1 + - 2.7.2 - name: ldap-authentication values: - no-tls