Skip to content

Commit 7a370cf

Browse files
adwk67claude
andcommitted
feat: adopt v2 config_overrides; build against the smooth-operator branch
Patches operator-rs to the smooth-operator branch (matching trino- and hdfs-operator) and actually consumes it: AirflowConfigOverrides.webserver_config_py now uses stackable_operator::v2::config_overrides::KeyValueConfigOverrides — the Merge-capable variant trino/hdfs use — instead of the v1 type. Drops the v1 KeyValueOverridesProvider impl and the as_product_config_overrides() call; merged_overrides reads the override map directly (role <- role-group extend), so the rendered webserver_config.py is unchanged (39 tests pass). The CRD gains `nullable: true` on the webserver_config.py override values (v2 allows null to delete a key). Regenerated extra/crds.yaml, Cargo.nix, and crate-hashes.json. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent a66bc67 commit 7a370cf

6 files changed

Lines changed: 158 additions & 59 deletions

File tree

Cargo.lock

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

Cargo.nix

Lines changed: 94 additions & 20 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ tokio = { version = "1.40", features = ["full"] }
3333
tracing = "0.1"
3434

3535
[patch."https://github.com/stackabletech/operator-rs.git"]
36+
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator" }
3637
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
3738
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

crate-hashes.json

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

0 commit comments

Comments
 (0)