From 87c5c5ae79330649cb08010002490503248c8346 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 23 May 2023 13:48:00 +0000 Subject: [PATCH] Support Kafka 3.4.0 (#591) # Description test: https://ci.stackable.tech/view/02%20Operator%20Tests%20(custom)/job/kafka-operator-it-custom/39/ Co-authored-by: Malte Sander --- .readme/partials/main.md.j2 | 2 +- CHANGELOG.md | 2 ++ README.md | 2 +- .../kafka/examples/getting_started/kafka.yaml | 2 +- .../kafka/pages/config_properties.adoc | 2 +- .../kafka/pages/usage-guide/security.adoc | 8 +++--- .../kafka/partials/supported-versions.adoc | 1 + .../simple-kafka-cluster-opa-log4j.yaml | 2 +- .../simple-kafka-cluster-opa-allow-all.yaml | 2 +- examples/tls/simple-kafka-cluster-tls.yaml | 2 +- rust/crd/src/affinity.rs | 8 +++--- rust/crd/src/lib.rs | 28 +++++++++---------- rust/crd/src/listener.rs | 12 ++++---- rust/operator/src/kafka_controller.rs | 5 +++- tests/test-definition.yaml | 7 +++-- 15 files changed, 46 insertions(+), 39 deletions(-) diff --git a/.readme/partials/main.md.j2 b/.readme/partials/main.md.j2 index 2a49a606..aa3c7856 100644 --- a/.readme/partials/main.md.j2 +++ b/.readme/partials/main.md.j2 @@ -28,7 +28,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: simple-kafka-znode diff --git a/CHANGELOG.md b/CHANGELOG.md index 164154b9..5b21f33c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - Generate OLM bundle for Release 23.4.0 ([#585]). - Fixed upgrade test on Openshift ([#585]). - Missing CRD defaults for `status.conditions` field ([#588]). +- Support Kafka 3.4.0 ([#591]). ### Changed @@ -20,6 +21,7 @@ All notable changes to this project will be documented in this file. [#584]: https://github.com/stackabletech/kafka-operator/pull/584 [#585]: https://github.com/stackabletech/kafka-operator/pull/585 [#588]: https://github.com/stackabletech/kafka-operator/pull/588 +[#591]: https://github.com/stackabletech/kafka-operator/pull/591 ## [23.4.0] - 2023-04-17 diff --git a/README.md b/README.md index 4eb92f4a..2e446189 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: simple-kafka-znode diff --git a/docs/modules/kafka/examples/getting_started/kafka.yaml b/docs/modules/kafka/examples/getting_started/kafka.yaml index fb3c5f35..da9b69b4 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.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: tls: diff --git a/docs/modules/kafka/pages/config_properties.adoc b/docs/modules/kafka/pages/config_properties.adoc index b4a248aa..54182b1a 100644 --- a/docs/modules/kafka/pages/config_properties.adoc +++ b/docs/modules/kafka/pages/config_properties.adoc @@ -10,7 +10,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" zookeeperConfigMapName: simple-kafka-znode brokers: diff --git a/docs/modules/kafka/pages/usage-guide/security.adoc b/docs/modules/kafka/pages/usage-guide/security.adoc index ca2b2c52..82ef2bd6 100644 --- a/docs/modules/kafka/pages/usage-guide/security.adoc +++ b/docs/modules/kafka/pages/usage-guide/security.adoc @@ -13,7 +13,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: simple-kafka-znode @@ -84,7 +84,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authentication: @@ -114,7 +114,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authorization: @@ -139,7 +139,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authorization: diff --git a/docs/modules/kafka/partials/supported-versions.adoc b/docs/modules/kafka/partials/supported-versions.adoc index c2cd44cc..ccb01854 100644 --- a/docs/modules/kafka/partials/supported-versions.adoc +++ b/docs/modules/kafka/partials/supported-versions.adoc @@ -7,3 +7,4 @@ - 3.1.0 - 3.2.0 - 3.3.1 +- 3.4.0 diff --git a/examples/logging/simple-kafka-cluster-opa-log4j.yaml b/examples/logging/simple-kafka-cluster-opa-log4j.yaml index bfe1866a..17e3c1c8 100644 --- a/examples/logging/simple-kafka-cluster-opa-log4j.yaml +++ b/examples/logging/simple-kafka-cluster-opa-log4j.yaml @@ -58,7 +58,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authorization: diff --git a/examples/opa/simple-kafka-cluster-opa-allow-all.yaml b/examples/opa/simple-kafka-cluster-opa-allow-all.yaml index d1b8f53b..70c6d692 100644 --- a/examples/opa/simple-kafka-cluster-opa-allow-all.yaml +++ b/examples/opa/simple-kafka-cluster-opa-allow-all.yaml @@ -58,7 +58,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authorization: diff --git a/examples/tls/simple-kafka-cluster-tls.yaml b/examples/tls/simple-kafka-cluster-tls.yaml index b5561cc5..e0ef86db 100644 --- a/examples/tls/simple-kafka-cluster-tls.yaml +++ b/examples/tls/simple-kafka-cluster-tls.yaml @@ -61,7 +61,7 @@ metadata: name: simple-kafka spec: image: - productVersion: 3.3.1 + productVersion: 3.4.0 stackableVersion: "0.0.0-dev" clusterConfig: authentication: diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index af497a51..e21cca67 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -46,8 +46,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: xyz brokers: @@ -104,8 +104,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: xyz brokers: diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 269c674c..30126a95 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -450,8 +450,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: xyz "#; @@ -469,8 +469,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: tls: serverSecretClass: simple-kafka-server-tls @@ -494,8 +494,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: tls: serverSecretClass: null @@ -515,8 +515,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" zookeeperConfigMapName: xyz clusterConfig: tls: @@ -540,8 +540,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: xyz "#; @@ -559,8 +559,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: tls: internalSecretClass: simple-kafka-internal-tls @@ -580,8 +580,8 @@ mod tests { name: simple-kafka spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: tls: serverSecretClass: simple-kafka-server-tls diff --git a/rust/crd/src/listener.rs b/rust/crd/src/listener.rs index 4213b01e..e8cb6937 100644 --- a/rust/crd/src/listener.rs +++ b/rust/crd/src/listener.rs @@ -215,8 +215,8 @@ mod tests { namespace: default spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: authentication: - authenticationClass: kafka-client-tls @@ -285,8 +285,8 @@ mod tests { namespace: default spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" clusterConfig: tls: serverSecretClass: tls @@ -345,8 +345,8 @@ mod tests { namespace: default spec: image: - productVersion: 3.3.1 - stackableVersion: "23.4.0-rc2" + productVersion: 3.4.0 + stackableVersion: "0.0.0-dev" zookeeperConfigMapName: xyz clusterConfig: tls: diff --git a/rust/operator/src/kafka_controller.rs b/rust/operator/src/kafka_controller.rs index 09b0f8ef..ae3f5708 100644 --- a/rust/operator/src/kafka_controller.rs +++ b/rust/operator/src/kafka_controller.rs @@ -790,7 +790,10 @@ fn build_broker_rolegroup_statefulset( ..EnvVar::default() }); - let jvm_args = format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar={}:/stackable/jmx/broker.yaml", METRICS_PORT); + let jvm_args = format!( + "-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={}:/stackable/jmx/broker.yaml", + METRICS_PORT + ); let kafka_listeners = get_kafka_listener_config(kafka, kafka_security, &rolegroup_ref.object_name()) .context(InvalidKafkaListenersSnafu)?; diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 3bf660c1..dff6ebed 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -10,9 +10,10 @@ dimensions: - 3.1.0-stackable0.0.0-dev - 3.2.0-stackable0.0.0-dev - 3.3.1-stackable0.0.0-dev + - 3.4.0-stackable0.0.0-dev - name: kafka-latest values: - - 3.3.1-stackable0.0.0-dev + - 3.4.0-stackable0.0.0-dev - name: zookeeper values: - 3.6.3-stackable0.0.0-dev @@ -24,11 +25,11 @@ dimensions: - name: upgrade_old values: - 2.8.1-stackable0.0.0-dev - - 3.1.0-stackable0.0.0-dev - 3.2.0-stackable0.0.0-dev + - 3.3.1-stackable0.0.0-dev - name: upgrade_new values: - - 3.3.1-stackable0.0.0-dev + - 3.4.0-stackable0.0.0-dev - name: use-client-tls values: - "true"