From 4b1e93be5e9070ebea6a0d983faf9118de647cbb Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 3 Feb 2025 16:01:41 +0100 Subject: [PATCH 1/4] chore(getting_started): Bump kafka to 3.7.2 --- docs/modules/kafka/examples/getting_started/kafka.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/kafka/examples/getting_started/kafka.yaml b/docs/modules/kafka/examples/getting_started/kafka.yaml index fad811e1..b1b69cfc 100644 --- a/docs/modules/kafka/examples/getting_started/kafka.yaml +++ b/docs/modules/kafka/examples/getting_started/kafka.yaml @@ -5,7 +5,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: tls: serverSecretClass: null From 6eb2104268af2809eaba6beb7bc05975e3e22e2f Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 3 Feb 2025 16:02:58 +0100 Subject: [PATCH 2/4] test: Bump kafka to 3.7.2, add 3.9.0. Also set upgrade test to do 3.8.0 -> 3.9.0 --- tests/test-definition.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 05e2d5d9..23214854 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -6,17 +6,18 @@ dimensions: - name: kafka values: - - 3.7.1 + - 3.7.2 - 3.8.0 + - 3.9.0 # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version # as in the example below. # - 3.8.0,oci.stackable.tech/sdp/kafka:3.8.0-stackable0.0.0-dev - name: kafka-latest values: - - 3.7.1 # Using LTS version here + - 3.7.2 # Using LTS version here # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version # as in the example below. - # - 3.7.1,oci.stackable.tech/sdp/kafka:3.7.1-stackable0.0.0-dev + # - 3.7.2,oci.stackable.tech/sdp/kafka:3.7.2-stackable0.0.0-dev - name: zookeeper values: - 3.9.2 @@ -25,10 +26,10 @@ dimensions: - 3.9.2 - name: upgrade_old values: - - 3.7.1 + - 3.8.0 - name: upgrade_new values: - - 3.8.0 + - 3.9.0 - name: use-client-tls values: - "true" From 6f72bf8b51217fe088e652f0481dccca1117063c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 3 Feb 2025 16:48:19 +0100 Subject: [PATCH 3/4] chore: Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33e2bb0e..ada6c5b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,10 +16,12 @@ All notable changes to this project will be documented in this file. - Run a `containerdebug` process in the background of each Kafka container to collect debugging information ([#803]). - Aggregate emitted Kubernetes events on the CustomResources ([#809]). - Support configuring JVM arguments ([#819]). +- Add Kafka 3.9.0 to tests ([#822]). ### Changed - Default to OCI for image metadata and product image selection ([#810]). +- Bump Kafka 3.7.1 to 3.7.2 in tests and getting_started, and bump upgrade testing from 3.7.1->3.8.0 to 3.8.0->3.9.0 ([#822]). [#796]: https://github.com/stackabletech/kafka-operator/pull/796 [#803]: https://github.com/stackabletech/kafka-operator/pull/803 @@ -27,6 +29,7 @@ All notable changes to this project will be documented in this file. [#810]: https://github.com/stackabletech/kafka-operator/pull/810 [#813]: https://github.com/stackabletech/kafka-operator/pull/813 [#819]: https://github.com/stackabletech/kafka-operator/pull/819 +[#822]: https://github.com/stackabletech/kafka-operator/pull/822 ## [24.11.1] - 2025-01-10 From 8e793eec0ee47aab2a8601374d8dd254a8196734 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 4 Feb 2025 09:40:45 +0100 Subject: [PATCH 4/4] chore: Update Kafka LTS patch level in manifests --- docs/modules/kafka/pages/usage-guide/security.adoc | 10 +++++----- .../logging/simple-kafka-cluster-opa-log4j.yaml | 2 +- .../opa/simple-kafka-cluster-opa-allow-all.yaml | 2 +- examples/tls/simple-kafka-cluster-tls.yaml | 2 +- rust/crd/src/affinity.rs | 2 +- rust/crd/src/lib.rs | 14 +++++++------- rust/crd/src/listener.rs | 4 ++-- rust/operator-binary/src/config/jvm.rs | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/modules/kafka/pages/usage-guide/security.adoc b/docs/modules/kafka/pages/usage-guide/security.adoc index e829a91b..8da828a9 100644 --- a/docs/modules/kafka/pages/usage-guide/security.adoc +++ b/docs/modules/kafka/pages/usage-guide/security.adoc @@ -15,7 +15,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: simple-kafka-znode tls: @@ -90,7 +90,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authentication: - authenticationClass: kafka-client-tls # <1> @@ -135,7 +135,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authentication: - authenticationClass: kafka-client-kerberos # <1> @@ -179,7 +179,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authorization: opa: @@ -203,7 +203,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authorization: opa: diff --git a/examples/logging/simple-kafka-cluster-opa-log4j.yaml b/examples/logging/simple-kafka-cluster-opa-log4j.yaml index b1c1823c..8aa117bf 100644 --- a/examples/logging/simple-kafka-cluster-opa-log4j.yaml +++ b/examples/logging/simple-kafka-cluster-opa-log4j.yaml @@ -50,7 +50,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authorization: opa: diff --git a/examples/opa/simple-kafka-cluster-opa-allow-all.yaml b/examples/opa/simple-kafka-cluster-opa-allow-all.yaml index 15064ba4..08c1d0d7 100644 --- a/examples/opa/simple-kafka-cluster-opa-allow-all.yaml +++ b/examples/opa/simple-kafka-cluster-opa-allow-all.yaml @@ -50,7 +50,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authorization: opa: diff --git a/examples/tls/simple-kafka-cluster-tls.yaml b/examples/tls/simple-kafka-cluster-tls.yaml index e2526a24..2e19771b 100644 --- a/examples/tls/simple-kafka-cluster-tls.yaml +++ b/examples/tls/simple-kafka-cluster-tls.yaml @@ -60,7 +60,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authentication: - authenticationClass: kafka-client-auth-tls diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index e600fdf7..97a4b771 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -45,7 +45,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: xyz brokers: diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index a8d6609b..1d8e1ff4 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -570,7 +570,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: xyz "#; @@ -588,7 +588,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: tls: serverSecretClass: simple-kafka-server-tls @@ -612,7 +612,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: tls: serverSecretClass: null @@ -632,7 +632,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 zookeeperConfigMapName: xyz clusterConfig: tls: @@ -656,7 +656,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: xyz "#; @@ -674,7 +674,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: tls: internalSecretClass: simple-kafka-internal-tls @@ -694,7 +694,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: tls: serverSecretClass: simple-kafka-server-tls diff --git a/rust/crd/src/listener.rs b/rust/crd/src/listener.rs index acbf1216..3ac33904 100644 --- a/rust/crd/src/listener.rs +++ b/rust/crd/src/listener.rs @@ -294,7 +294,7 @@ mod tests { namespace: default spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authentication: - authenticationClass: kafka-client-tls @@ -471,7 +471,7 @@ mod tests { namespace: default spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: authentication: - authenticationClass: kafka-kerberos diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index 233f7635..9fef7931 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -110,7 +110,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: xyz brokers: @@ -140,7 +140,7 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.7.1 + productVersion: 3.7.2 clusterConfig: zookeeperConfigMapName: xyz brokers: