From 8fa4c515a0f73ad7fa91743bf4c0574d346115b0 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Tue, 20 Dec 2022 12:26:59 +0100 Subject: [PATCH 1/6] Bump operator-rs to 30.1 --- rust/crd/Cargo.toml | 2 +- rust/operator-binary/Cargo.toml | 4 ++-- rust/operator/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index 51a994ae..cc59db4e 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -9,7 +9,7 @@ version = "0.9.0-nightly" publish = false [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } semver = "1.0.14" serde = { version = "1.0.147", features = ["derive"] } diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 90094947..e0589711 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] stackable-kafka-crd = { path = "../crd" } stackable-kafka-operator = { path = "../operator" } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } clap = "4.0.26" tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } @@ -20,7 +20,7 @@ tracing = "0.1.37" [build-dependencies] built = { version = "0.5.1", features = ["chrono", "git2"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } stackable-kafka-crd = { path = "../crd" } [[bin]] diff --git a/rust/operator/Cargo.toml b/rust/operator/Cargo.toml index dc54714c..c9f94818 100644 --- a/rust/operator/Cargo.toml +++ b/rust/operator/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] stackable-kafka-crd = { path = "../crd" } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } futures = "0.3.25" serde = { version = "1.0.147", features = ["derive"] } From db4b046f1033370e4324e031dc620ca2441fb1a0 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Tue, 20 Dec 2022 12:27:39 +0100 Subject: [PATCH 2/6] Add node selector for RoleGroups --- rust/operator/src/kafka_controller.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/operator/src/kafka_controller.rs b/rust/operator/src/kafka_controller.rs index bdb4fdb4..5267dbfb 100644 --- a/rust/operator/src/kafka_controller.rs +++ b/rust/operator/src/kafka_controller.rs @@ -845,6 +845,7 @@ fn build_broker_rolegroup_statefulset( .add_init_container(container_get_svc) .add_container(cb_kafka.build()) .add_container(container_kcat_prober) + .node_selector_opt(rolegroup.selector.clone()) .add_volume(Volume { name: "config".to_string(), config_map: Some(ConfigMapVolumeSource { From 8a43fcffe15ada64ff7bd737fac5f877b8b8beb4 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Dec 2022 09:49:03 +0100 Subject: [PATCH 3/6] Add Cargo.lock --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 075e507a..bf0d1424 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1796,8 +1796,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.27.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.27.1#c470ea5de96c0f4081e77fd7c8ce197ecebbd406" +version = "0.30.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.1#34cc76200b6432f7b143ca1350e665ddb169df88" dependencies = [ "chrono", "clap", @@ -1830,8 +1830,8 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.27.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.27.1#c470ea5de96c0f4081e77fd7c8ce197ecebbd406" +version = "0.30.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.1#34cc76200b6432f7b143ca1350e665ddb169df88" dependencies = [ "darling", "proc-macro2", From ed64c44655d6dc18a660779cb206472b4c2b626c Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Dec 2022 10:21:42 +0100 Subject: [PATCH 4/6] Updated changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be117f7e..3d58dcd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,13 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Changed - +- Fixed the RoleGroup `selector`. It was not used before. ([#530]) - Updated stackable image versions ([#513]). - operator-rs: 0.26.0 -> 0.27.1 ([#519]). - Don't run init container as root and avoid chmod and chowning ([#524]). - [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#482]). - [BREAKING]: Removed tools image for init and get-svc container and replaced with Kafka product image. This means the latest stackable version has to be used in the product image selection ([#527]) - +[#530]: https://github.com/stackabletech/kafka-operator/pull/530 [#482]: https://github.com/stackabletech/kafka-operator/pull/482 [#513]: https://github.com/stackabletech/kafka-operator/pull/513 [#519]: https://github.com/stackabletech/kafka-operator/pull/519 From ed028917fa4deb5d3f9d13cc700bccf45139b159 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Dec 2022 10:26:32 +0100 Subject: [PATCH 5/6] Markdown lint for changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d58dcd3..c3275f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,14 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Changed + - Fixed the RoleGroup `selector`. It was not used before. ([#530]) - Updated stackable image versions ([#513]). - operator-rs: 0.26.0 -> 0.27.1 ([#519]). - Don't run init container as root and avoid chmod and chowning ([#524]). - [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#482]). - [BREAKING]: Removed tools image for init and get-svc container and replaced with Kafka product image. This means the latest stackable version has to be used in the product image selection ([#527]) + [#530]: https://github.com/stackabletech/kafka-operator/pull/530 [#482]: https://github.com/stackabletech/kafka-operator/pull/482 [#513]: https://github.com/stackabletech/kafka-operator/pull/513 From 3131f554f4d92357a438efadfda0fc6f234131bc Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Wed, 21 Dec 2022 11:18:11 +0100 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3275f48..bcd677e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. - Fixed the RoleGroup `selector`. It was not used before. ([#530]) - Updated stackable image versions ([#513]). -- operator-rs: 0.26.0 -> 0.27.1 ([#519]). +- operator-rs: 0.26.0 -> 0.30.1 ([#519], [#530]). - Don't run init container as root and avoid chmod and chowning ([#524]). - [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#482]). - [BREAKING]: Removed tools image for init and get-svc container and replaced with Kafka product image. This means the latest stackable version has to be used in the product image selection ([#527])