Skip to content

Commit 5a7b960

Browse files
Merge branch 'main' into move-git-sync-to-operator-rs
2 parents 0a34da1 + fce0f72 commit 5a7b960

17 files changed

+26
-29
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept.
1010
- Use `--file-log-rotation-period` (or `FILE_LOG_ROTATION_PERIOD`) to configure the frequency of rotation.
1111
- Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`.
12+
- Add support for airflow `2.10.5` ([#625]).
1213

1314
### Changed
1415

@@ -22,6 +23,7 @@
2223
of having the operator write it to the vector config ([#600]).
2324
- test: Bump to Vector 0.46.1 ([#620]).
2425
- test: Bump OPA to `1.4.2` ([#624]).
26+
- Deprecate airflow `2.10.4` ([#625]).
2527
- Move the git-sync implementation to operator-rs ([#623]). The functionality should not have changed.
2628

2729
### Fixed
@@ -38,6 +40,7 @@
3840
[#620]: https://github.com/stackabletech/airflow-operator/pull/620
3941
[#623]: https://github.com/stackabletech/airflow-operator/pull/623
4042
[#624]: https://github.com/stackabletech/airflow-operator/pull/624
43+
[#625]: https://github.com/stackabletech/airflow-operator/pull/625
4144

4245
## [25.3.0] - 2025-03-21
4346

docs/modules/airflow/examples/example-airflow-dags-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: airflow
66
spec:
77
image:
8-
productVersion: 2.10.4
8+
productVersion: 2.10.5
99
clusterConfig:
1010
loadExamples: false
1111
exposeConfig: false

docs/modules/airflow/examples/example-airflow-gitsync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: airflow
66
spec:
77
image:
8-
productVersion: "2.10.4"
8+
productVersion: "2.10.5"
99
clusterConfig:
1010
loadExamples: false
1111
exposeConfig: false

docs/modules/airflow/examples/example-airflow-incluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: airflow
66
spec:
77
image:
8-
productVersion: 2.10.4
8+
productVersion: 2.10.5
99
clusterConfig:
1010
loadExamples: false
1111
exposeConfig: false

docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-logging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: airflow
55
spec:
66
image:
7-
productVersion: 2.10.4
7+
productVersion: 2.10.5
88
clusterConfig: {}
99
webservers:
1010
envOverrides: &envOverrides

docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-xcom.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: airflow
55
spec:
66
image:
7-
productVersion: 2.10.4
7+
productVersion: 2.10.5
88
clusterConfig: {}
99
webservers:
1010
envOverrides: &envOverrides

docs/modules/airflow/examples/getting_started/code/airflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: airflow
66
spec:
77
image:
8-
productVersion: 2.10.4
8+
productVersion: 2.10.5
99
clusterConfig:
1010
loadExamples: true
1111
exposeConfig: false

docs/modules/airflow/pages/required-external-components.adoc

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
= Required external components
2-
:description: Airflow requires PostgreSQL, MySQL, or SQLite for database support, and Redis for Celery executors. MSSQL has experimental support.
2+
:description: Airflow requires PostgreSQL or MySQL for database support, and Redis for Celery executors.
33
:airflow-prerequisites: https://airflow.apache.org/docs/apache-airflow/stable/installation/prerequisites.html
44

55
Airflow requires an SQL database to operate.
66
The {airflow-prerequisites}[Airflow documentation] specifies:
77

88
Fully supported for production usage:
99

10-
* PostgreSQL: 11, 12, 13, 14, 15
11-
* MySQL: 5.7, 8
12-
13-
Supported for development and testing purposes:
14-
15-
* SQLite: 3.15.0+
16-
17-
Experimental support:
18-
19-
* MSSQL: 2017, 2019
10+
* PostgreSQL: 12, 13, 14, 15, 16
11+
* MySQL: 8.0, Innovation
2012
2113
The Celery exectutor also requires:
2214

docs/modules/airflow/pages/usage-guide/security.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ metadata:
3737
name: airflow-with-ldap
3838
spec:
3939
image:
40-
productVersion: 2.10.4
40+
productVersion: 2.10.5
4141
clusterConfig:
4242
authentication:
4343
- authenticationClass: ldap # <1>
@@ -71,7 +71,7 @@ metadata:
7171
name: airflow-with-oidc
7272
spec:
7373
image:
74-
productVersion: 2.10.4
74+
productVersion: 2.10.5
7575
clusterConfig:
7676
authentication:
7777
- authenticationClass: keycloak # <1>

docs/modules/airflow/partials/supported-versions.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
// This is a separate file, since it is used by both the direct Airflow-Operator documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
- 2.10.4
5+
- 2.10.5
6+
- 2.10.4 (deprecated)
67
- 2.9.3 (LTS)

examples/simple-airflow-cluster-dags-cmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ metadata:
8282
name: airflow-dags-cmap
8383
spec:
8484
image:
85-
productVersion: 2.10.4
85+
productVersion: 2.10.5
8686
clusterConfig:
8787
loadExamples: false
8888
exposeConfig: false

examples/simple-airflow-cluster-ldap-insecure-tls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ metadata:
148148
name: airflow-insecure-tls
149149
spec:
150150
image:
151-
productVersion: 2.10.4
151+
productVersion: 2.10.5
152152
clusterConfig:
153153
loadExamples: true
154154
exposeConfig: true

examples/simple-airflow-cluster-ldap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ metadata:
146146
name: airflow-with-ldap-server-veri-tls
147147
spec:
148148
image:
149-
productVersion: 2.10.4
149+
productVersion: 2.10.5
150150
clusterConfig:
151151
loadExamples: true
152152
exposeConfig: true

examples/simple-airflow-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
name: airflow
2323
spec:
2424
image:
25-
productVersion: 2.10.4
25+
productVersion: 2.10.5
2626
clusterConfig:
2727
loadExamples: true
2828
exposeConfig: false

rust/operator-binary/src/crd/affinity.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ mod tests {
6969
name: airflow
7070
spec:
7171
image:
72-
productVersion: 2.10.4
72+
productVersion: 2.10.5
7373
clusterConfig:
7474
credentialsSecret: airflow-credentials
7575
webservers:
@@ -163,7 +163,7 @@ mod tests {
163163
name: airflow
164164
spec:
165165
image:
166-
productVersion: 2.10.4
166+
productVersion: 2.10.5
167167
clusterConfig:
168168
credentialsSecret: airflow-credentials
169169
webservers:

rust/operator-binary/src/crd/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ mod tests {
923923
name: airflow
924924
spec:
925925
image:
926-
productVersion: 2.10.4
926+
productVersion: 2.10.5
927927
clusterConfig:
928928
loadExamples: true
929929
exposeConfig: true
@@ -947,7 +947,7 @@ mod tests {
947947
let resolved_airflow_image: ResolvedProductImage =
948948
cluster.spec.image.resolve("airflow", "0.0.0-dev");
949949

950-
assert_eq!("2.10.4", &resolved_airflow_image.product_version);
950+
assert_eq!("2.10.5", &resolved_airflow_image.product_version);
951951

952952
assert_eq!("KubernetesExecutor", cluster.spec.executor.to_string());
953953
assert!(cluster.spec.cluster_config.load_examples);

tests/test-definition.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ dimensions:
99
values:
1010
- 2.9.3
1111
- 2.10.4
12+
- 2.10.5
1213
# To use a custom image, add a comma and the full name after the product version
1314
# - 2.9.3,oci.stackable.tech/sandbox/airflow:2.9.3-stackable0.0.0-dev
1415
- name: airflow-latest
1516
values:
16-
- 2.10.4
17+
- 2.10.5
1718
# To use a custom image, add a comma and the full name after the product version
1819
# - 2.9.3,oci.stackable.tech/sandbox/airflow:2.9.3-stackable0.0.0-dev
1920
- name: opa-latest

0 commit comments

Comments
 (0)