Skip to content

Commit d07f9bd

Browse files
maltesandersoenkeliebausiegfriedweber
authored
Patch op-rs version to use one that fixes SUP-148. (#545)
* Patch op-rs version to use one that fixes SUP-148. * Updated changelog Use op-rs 0.82 instead of PR branch. * Regenerate Nix files --------- Co-authored-by: Sönke Liebau <soenke.liebau@stackable.tech> Co-authored-by: Siegfried Weber <mail@siegfriedweber.net>
1 parent 97b7160 commit d07f9bd

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
- Pass gitsync credentials through properly and use a fine-grained access token ([#489]).
2828
- Failing to parse one `AirflowCluster`/`AuthenticationClass` should no longer cause the whole operator to stop functioning ([#520]).
29+
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after restart ([#545]).
2930

3031
[#488]: https://github.com/stackabletech/airflow-operator/pull/488
3132
[#489]: https://github.com/stackabletech/airflow-operator/pull/489
@@ -35,6 +36,7 @@
3536
[#520]: https://github.com/stackabletech/airflow-operator/pull/520
3637
[#524]: https://github.com/stackabletech/airflow-operator/pull/524
3738
[#530]: https://github.com/stackabletech/airflow-operator/pull/530
39+
[#545]: https://github.com/stackabletech/airflow-operator/pull/545
3840

3941
## [24.7.0] - 2024-07-24
4042

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["derive"] }
2323
serde_json = "1.0"
2424
serde_yaml = "0.9"
2525
snafu = "0.8"
26-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
26+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.82.0" }
2727
strum = { version = "0.26", features = ["derive"] }
2828
tokio = { version = "1.40", features = ["full"] }
2929
tracing = "0.1"

crate-hashes.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/operator-binary/src/airflow_controller.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use stackable_operator::{
4646
apps::v1::{StatefulSet, StatefulSetSpec},
4747
core::v1::{
4848
ConfigMap, EmptyDirVolumeSource, EnvVar, PodTemplateSpec, Probe, Service,
49-
ServicePort, ServiceSpec, TCPSocketAction, VolumeMount,
49+
ServiceAccount, ServicePort, ServiceSpec, TCPSocketAction, VolumeMount,
5050
},
5151
},
5252
apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
@@ -416,7 +416,7 @@ pub async fn reconcile_airflow(
416416
build_rbac_resources(airflow, APP_NAME, required_labels).context(BuildRBACObjectsSnafu)?;
417417

418418
let rbac_sa = cluster_resources
419-
.add(client, rbac_sa)
419+
.add(client, rbac_sa.clone())
420420
.await
421421
.context(ApplyServiceAccountSnafu)?;
422422
cluster_resources
@@ -488,7 +488,7 @@ pub async fn reconcile_airflow(
488488
&rolegroup,
489489
rolegroup_config,
490490
&authentication_config,
491-
&rbac_sa.name_unchecked(),
491+
&rbac_sa,
492492
&merged_airflow_config,
493493
airflow_executor,
494494
)?;
@@ -836,7 +836,7 @@ fn build_server_rolegroup_statefulset(
836836
rolegroup_ref: &RoleGroupRef<AirflowCluster>,
837837
rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
838838
authentication_config: &AirflowClientAuthenticationDetailsResolved,
839-
sa_name: &str,
839+
service_account: &ServiceAccount,
840840
merged_airflow_config: &AirflowConfig,
841841
executor: &AirflowExecutor,
842842
) -> Result<StatefulSet> {
@@ -861,7 +861,7 @@ fn build_server_rolegroup_statefulset(
861861
pb.metadata(pb_metadata)
862862
.image_pull_secrets_from_product_image(resolved_product_image)
863863
.affinity(&merged_airflow_config.affinity)
864-
.service_account_name(sa_name)
864+
.service_account_name(service_account.name_any())
865865
.security_context(
866866
PodSecurityContextBuilder::new()
867867
.run_as_user(AIRFLOW_UID)

0 commit comments

Comments
 (0)