Skip to content

Commit

Permalink
chore: Add airflow 2.9.3, deprecate 2.9.2, remove 2.6.x and 2.8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
NickLarsenNZ committed Aug 26, 2024
1 parent 9ce3aa7 commit 725a66a
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/airflow/examples/example-airflow-gitsync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: airflow
spec:
image:
productVersion: "2.9.2"
productVersion: "2.9.3"
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: true
exposeConfig: false
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/airflow/pages/usage-guide/security.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
name: airflow-with-ldap
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
authentication:
- authenticationClass: ldap # <1>
Expand Down
6 changes: 2 additions & 4 deletions docs/modules/airflow/partials/supported-versions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
// This is a separate file, since it is used by both the direct Airflow-Operator documentation, and the overarching
// Stackable Platform documentation.

- 2.9.2 (LTS)
- 2.8.4 (deprecated)
- 2.8.1 (deprecated)
- 2.6.3 (deprecated)
- 2.9.3 (LTS)
- 2.9.2 (deprecated)
2 changes: 1 addition & 1 deletion examples/simple-airflow-cluster-dags-cmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ metadata:
name: airflow-dags-cmap
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-airflow-cluster-ldap-insecure-tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ metadata:
name: airflow-insecure-tls
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: true
exposeConfig: true
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-airflow-cluster-ldap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ metadata:
name: airflow-with-ldap-server-veri-tls
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: true
exposeConfig: true
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-airflow-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: true
exposeConfig: false
Expand Down
4 changes: 2 additions & 2 deletions rust/crd/src/affinity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
credentialsSecret: airflow-credentials
webservers:
Expand Down Expand Up @@ -164,7 +164,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
credentialsSecret: airflow-credentials
webservers:
Expand Down
6 changes: 3 additions & 3 deletions rust/crd/src/git_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down Expand Up @@ -154,7 +154,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down Expand Up @@ -227,7 +227,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: false
exposeConfig: false
Expand Down
4 changes: 2 additions & 2 deletions rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ mod tests {
name: airflow
spec:
image:
productVersion: 2.9.2
productVersion: 2.9.3
clusterConfig:
loadExamples: true
exposeConfig: true
Expand All @@ -803,7 +803,7 @@ mod tests {
let resolved_airflow_image: ResolvedProductImage =
cluster.spec.image.resolve("airflow", "0.0.0-dev");

assert_eq!("2.9.2", &resolved_airflow_image.product_version);
assert_eq!("2.9.3", &resolved_airflow_image.product_version);

assert_eq!("KubernetesExecutor", cluster.spec.executor.to_string());
assert!(cluster.spec.cluster_config.load_examples);
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/airflow_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ fn build_executor_template_config_map(
.context(GracefulShutdownSnafu)?;

// N.B. this "base" name is an airflow requirement and should not be changed!
// See https://airflow.apache.org/docs/apache-airflow/2.6.1/core-concepts/executor/kubernetes.html#base-image
// See https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/stable/kubernetes_executor.html#base-image
let mut airflow_container =
ContainerBuilder::new(&Container::Base.to_string()).context(InvalidContainerNameSnafu)?;

Expand Down
6 changes: 2 additions & 4 deletions tests/test-definition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
dimensions:
- name: airflow
values:
- 2.6.3
- 2.8.1
- 2.8.4
- 2.9.2
- 2.9.3
# To use a custom image, add a comma and the full name after the product version
# - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
- name: airflow-latest
values:
- 2.8.1
- 2.9.3
# To use a custom image, add a comma and the full name after the product version
# - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
- name: ldap-authentication
Expand Down

0 comments on commit 725a66a

Please sign in to comment.