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 <[email protected]>
stackabletech · May 23, 2023 · 87c5c5a · 87c5c5a
1 parent 6065e79
commit 87c5c5a
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ @@
     - 3.1.0
     - 3.2.0
     - 3.3.1
+    - 3.4.0