Add support for Kafka 3.7.0 and remove Kafka 3.5.2 (#9747)

Signed-off-by: Jakub Scholz <www@scholzj.com>

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## 0.40.0
 
-* Remove support for Apache Kafka 3.5.0 and 3.5.1
+* Add support for Apache Kafka 3.7.0.
+  Remove support for Apache Kafka 3.5.0, 3.5.1, and 3.5.2.
 * The `UseKRaft` feature gate moves to beta stage and is enabled by default.
   If needed, `UseKRaft` can be disabled in the feature gates configuration in the Cluster Operator.
 * Add support for moving from dedicated controller-only KRaft nodes to mixed KRaft nodes

cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectApiImpl.java

@@ -443,11 +443,13 @@ public Future<Map<String, String>> listConnectLoggers(Reconciliation reconciliat
                                             Map<String, Map<String, String>> fetchedLoggers = mapper.readValue(buffer.getBytes(), MAP_OF_MAP_OF_STRINGS);
                                             Map<String, String> loggerMap = new HashMap<>(fetchedLoggers.size());
                                             for (var e : fetchedLoggers.entrySet()) {
-                                                String level = e.getValue().get("level");
-                                                if (level != null && e.getValue().size() == 1) {
-                                                    loggerMap.put(e.getKey(), level);
+                                                if (Set.of("level", "last_modified").containsAll(e.getValue().keySet()))   {
+                                                    String level = e.getValue().get("level");
+                                                    if (level != null) {
+                                                        loggerMap.put(e.getKey(), level);
+                                                    }
                                                 } else {
-                                                    result.tryFail("Inner map has unexpected keys " + e.getValue().keySet());
+                                                    result.tryFail(new RuntimeException("Inner map has unexpected keys " + e.getValue().keySet()));
                                                     break;
                                                 }
                                             }

cluster-operator/src/test/java/io/strimzi/operator/cluster/KafkaVersionTestUtils.java

@@ -21,25 +21,25 @@ public class KafkaVersionTestUtils {
 
     private static final Set<String> SUPPORTED_VERSIONS = new KafkaVersion.Lookup(Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap()).supportedVersions();
 
-    public static final String LATEST_KAFKA_VERSION = "3.6.1";
-    public static final String LATEST_FORMAT_VERSION = "3.6";
-    public static final String LATEST_PROTOCOL_VERSION = "3.6";
-    public static final String LATEST_METADATA_VERSION = "3.6-IV2";
+    public static final String LATEST_KAFKA_VERSION = "3.7.0";
+    public static final String LATEST_FORMAT_VERSION = "3.7";
+    public static final String LATEST_PROTOCOL_VERSION = "3.7";
+    public static final String LATEST_METADATA_VERSION = "3.7-IV4";
     public static final String LATEST_ZOOKEEPER_VERSION = "3.8.3";
     public static final String LATEST_CHECKSUM = "ABCD1234";
-    public static final String LATEST_THIRD_PARTY_VERSION = "3.6.x";
+    public static final String LATEST_THIRD_PARTY_VERSION = "3.7.x";
     public static final String LATEST_KAFKA_IMAGE = KAFKA_IMAGE_STR + LATEST_KAFKA_VERSION;
     public static final String LATEST_KAFKA_CONNECT_IMAGE = KAFKA_CONNECT_IMAGE_STR + LATEST_KAFKA_VERSION;
     public static final String LATEST_KAFKA_MIRROR_MAKER_IMAGE = KAFKA_MIRROR_MAKER_IMAGE_STR + LATEST_KAFKA_VERSION;
     public static final String LATEST_KAFKA_MIRROR_MAKER_2_IMAGE = KAFKA_MIRROR_MAKER_2_IMAGE_STR + LATEST_KAFKA_VERSION;
 
-    public static final String PREVIOUS_KAFKA_VERSION = "3.5.2";
-    public static final String PREVIOUS_FORMAT_VERSION = "3.5";
-    public static final String PREVIOUS_PROTOCOL_VERSION = "3.5";
-    public static final String PREVIOUS_METADATA_VERSION = "3.5-IV2";
-    public static final String PREVIOUS_ZOOKEEPER_VERSION = "3.6.4";
+    public static final String PREVIOUS_KAFKA_VERSION = "3.6.1";
+    public static final String PREVIOUS_FORMAT_VERSION = "3.6";
+    public static final String PREVIOUS_PROTOCOL_VERSION = "3.6";
+    public static final String PREVIOUS_METADATA_VERSION = "3.6-IV2";
+    public static final String PREVIOUS_ZOOKEEPER_VERSION = "3.8.3";
     public static final String PREVIOUS_CHECKSUM = "ABCD1234";
-    public static final String PREVIOUS_THIRD_PARTY_VERSION = "3.4.x";
+    public static final String PREVIOUS_THIRD_PARTY_VERSION = "3.6.x";
     public static final String PREVIOUS_KAFKA_IMAGE = KAFKA_IMAGE_STR + PREVIOUS_KAFKA_VERSION;
     public static final String PREVIOUS_KAFKA_CONNECT_IMAGE = KAFKA_CONNECT_IMAGE_STR + PREVIOUS_KAFKA_VERSION;
     public static final String PREVIOUS_KAFKA_MIRROR_MAKER_IMAGE = KAFKA_MIRROR_MAKER_IMAGE_STR + PREVIOUS_KAFKA_VERSION;

cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaConfigurationTests.java

@@ -89,7 +89,7 @@ public void passwordType() {
     @ParallelTest
     public void invalidVersion() {
         assertConfigError("inter.broker.protocol.version", "dclncswn",
-                "inter.broker.protocol.version has value 'dclncswn' which does not match the required pattern: \\Q0.8.0\\E(\\.[0-9]+)*|\\Q0.8.0\\E|\\Q0.8.1\\E(\\.[0-9]+)*|\\Q0.8.1\\E|\\Q0.8.2\\E(\\.[0-9]+)*|\\Q0.8.2\\E|\\Q0.9.0\\E(\\.[0-9]+)*|\\Q0.9.0\\E|\\Q0.10.0\\E(\\.[0-9]+)*|\\Q0.10.0-IV0\\E|\\Q0.10.0-IV1\\E|\\Q0.10.1\\E(\\.[0-9]+)*|\\Q0.10.1-IV0\\E|\\Q0.10.1-IV1\\E|\\Q0.10.1-IV2\\E|\\Q0.10.2\\E(\\.[0-9]+)*|\\Q0.10.2-IV0\\E|\\Q0.11.0\\E(\\.[0-9]+)*|\\Q0.11.0-IV0\\E|\\Q0.11.0-IV1\\E|\\Q0.11.0-IV2\\E|\\Q1.0\\E(\\.[0-9]+)*|\\Q1.0-IV0\\E|\\Q1.1\\E(\\.[0-9]+)*|\\Q1.1-IV0\\E|\\Q2.0\\E(\\.[0-9]+)*|\\Q2.0-IV0\\E|\\Q2.0-IV1\\E|\\Q2.1\\E(\\.[0-9]+)*|\\Q2.1-IV0\\E|\\Q2.1-IV1\\E|\\Q2.1-IV2\\E|\\Q2.2\\E(\\.[0-9]+)*|\\Q2.2-IV0\\E|\\Q2.2-IV1\\E|\\Q2.3\\E(\\.[0-9]+)*|\\Q2.3-IV0\\E|\\Q2.3-IV1\\E|\\Q2.4\\E(\\.[0-9]+)*|\\Q2.4-IV0\\E|\\Q2.4-IV1\\E|\\Q2.5\\E(\\.[0-9]+)*|\\Q2.5-IV0\\E|\\Q2.6\\E(\\.[0-9]+)*|\\Q2.6-IV0\\E|\\Q2.7\\E(\\.[0-9]+)*|\\Q2.7-IV0\\E|\\Q2.7-IV1\\E|\\Q2.7-IV2\\E|\\Q2.8\\E(\\.[0-9]+)*|\\Q2.8-IV0\\E|\\Q2.8-IV1\\E|\\Q3.0\\E(\\.[0-9]+)*|\\Q3.0-IV0\\E|\\Q3.0-IV1\\E|\\Q3.1\\E(\\.[0-9]+)*|\\Q3.1-IV0\\E|\\Q3.2\\E(\\.[0-9]+)*|\\Q3.2-IV0\\E|\\Q3.3\\E(\\.[0-9]+)*|\\Q3.3-IV0\\E|\\Q3.3-IV1\\E|\\Q3.3-IV2\\E|\\Q3.3-IV3\\E|\\Q3.4\\E(\\.[0-9]+)*|\\Q3.4-IV0\\E|\\Q3.5\\E(\\.[0-9]+)*|\\Q3.5-IV0\\E|\\Q3.5-IV1\\E|\\Q3.5-IV2\\E|\\Q3.6\\E(\\.[0-9]+)*|\\Q3.6-IV0\\E|\\Q3.6-IV1\\E|\\Q3.6-IV2\\E");
+                "inter.broker.protocol.version has value 'dclncswn' which does not match the required pattern: \\Q0.8.0\\E(\\.[0-9]+)*|\\Q0.8.0\\E|\\Q0.8.1\\E(\\.[0-9]+)*|\\Q0.8.1\\E|\\Q0.8.2\\E(\\.[0-9]+)*|\\Q0.8.2\\E|\\Q0.9.0\\E(\\.[0-9]+)*|\\Q0.9.0\\E|\\Q0.10.0\\E(\\.[0-9]+)*|\\Q0.10.0-IV0\\E|\\Q0.10.0-IV1\\E|\\Q0.10.1\\E(\\.[0-9]+)*|\\Q0.10.1-IV0\\E|\\Q0.10.1-IV1\\E|\\Q0.10.1-IV2\\E|\\Q0.10.2\\E(\\.[0-9]+)*|\\Q0.10.2-IV0\\E|\\Q0.11.0\\E(\\.[0-9]+)*|\\Q0.11.0-IV0\\E|\\Q0.11.0-IV1\\E|\\Q0.11.0-IV2\\E|\\Q1.0\\E(\\.[0-9]+)*|\\Q1.0-IV0\\E|\\Q1.1\\E(\\.[0-9]+)*|\\Q1.1-IV0\\E|\\Q2.0\\E(\\.[0-9]+)*|\\Q2.0-IV0\\E|\\Q2.0-IV1\\E|\\Q2.1\\E(\\.[0-9]+)*|\\Q2.1-IV0\\E|\\Q2.1-IV1\\E|\\Q2.1-IV2\\E|\\Q2.2\\E(\\.[0-9]+)*|\\Q2.2-IV0\\E|\\Q2.2-IV1\\E|\\Q2.3\\E(\\.[0-9]+)*|\\Q2.3-IV0\\E|\\Q2.3-IV1\\E|\\Q2.4\\E(\\.[0-9]+)*|\\Q2.4-IV0\\E|\\Q2.4-IV1\\E|\\Q2.5\\E(\\.[0-9]+)*|\\Q2.5-IV0\\E|\\Q2.6\\E(\\.[0-9]+)*|\\Q2.6-IV0\\E|\\Q2.7\\E(\\.[0-9]+)*|\\Q2.7-IV0\\E|\\Q2.7-IV1\\E|\\Q2.7-IV2\\E|\\Q2.8\\E(\\.[0-9]+)*|\\Q2.8-IV0\\E|\\Q2.8-IV1\\E|\\Q3.0\\E(\\.[0-9]+)*|\\Q3.0-IV0\\E|\\Q3.0-IV1\\E|\\Q3.1\\E(\\.[0-9]+)*|\\Q3.1-IV0\\E|\\Q3.2\\E(\\.[0-9]+)*|\\Q3.2-IV0\\E|\\Q3.3\\E(\\.[0-9]+)*|\\Q3.3-IV0\\E|\\Q3.3-IV1\\E|\\Q3.3-IV2\\E|\\Q3.3-IV3\\E|\\Q3.4\\E(\\.[0-9]+)*|\\Q3.4-IV0\\E|\\Q3.5\\E(\\.[0-9]+)*|\\Q3.5-IV0\\E|\\Q3.5-IV1\\E|\\Q3.5-IV2\\E|\\Q3.6\\E(\\.[0-9]+)*|\\Q3.6-IV0\\E|\\Q3.6-IV1\\E|\\Q3.6-IV2\\E|\\Q3.7\\E(\\.[0-9]+)*|\\Q3.7-IV0\\E|\\Q3.7-IV1\\E|\\Q3.7-IV2\\E|\\Q3.7-IV3\\E|\\Q3.7-IV4\\E|\\Q3.8\\E(\\.[0-9]+)*|\\Q3.8-IV0\\E");
     }
 
     @ParallelTest

cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectAssemblyOperatorPodSetTest.java

@@ -1453,12 +1453,12 @@ public void testBuildChangedCluster(VertxTestContext context)  {
                     assertThat(capturesPodSets.size(), is(1));
                     StrimziPodSet podSet = capturesPodSets.get(0);
                     assertThat(podSet.getMetadata().getName(), is(COMPONENT_NAME));
-                    assertThat(podSet.getMetadata().getAnnotations().get(Annotations.STRIMZI_IO_CONNECT_BUILD_REVISION), is("4e105c43751944b0"));
+                    assertThat(podSet.getMetadata().getAnnotations().get(Annotations.STRIMZI_IO_CONNECT_BUILD_REVISION), is("28987d00751944b0"));
                     assertThat(podSet.getMetadata().getAnnotations().get(Annotations.STRIMZI_IO_CONNECT_BUILD_IMAGE), is("my-connect-build@sha256:blablabla"));
                     assertThat(podSet.getSpec().getPods().size(), is(3));
 
                     for (Pod pod : PodSetUtils.podSetToPods(podSet))  {
-                        assertThat(pod.getMetadata().getAnnotations().get(Annotations.STRIMZI_IO_CONNECT_BUILD_REVISION), is("4e105c43751944b0"));
+                        assertThat(pod.getMetadata().getAnnotations().get(Annotations.STRIMZI_IO_CONNECT_BUILD_REVISION), is("28987d00751944b0"));
                         assertThat(pod.getSpec().getContainers().get(0).getImage(), is("my-connect-build@sha256:blablabla"));
                     }
 

config-model-generator/pom.xml

@@ -37,6 +37,11 @@
                 <artifactId>kafka-raft</artifactId>
                 <version>${kafka-metadata-version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-server-common</artifactId>
+                <version>${kafka-metadata-version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

docker-images/artifacts/kafka-thirdparty-libs/3.6.x/pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <strimzi-oauth.version>0.14.0</strimzi-oauth.version>
         <jayway-json-path.version>2.9.0</jayway-json-path.version>
-        <cruise-control.version>2.5.135</cruise-control.version>
+        <cruise-control.version>2.5.137</cruise-control.version>
         <opa-authorizer.version>1.5.1</opa-authorizer.version>
         <kafka-quotas-plugin.version>0.2.0</kafka-quotas-plugin.version>
         <kafka-mirror-maker-2-extensions.version>1.2.0</kafka-mirror-maker-2-extensions.version>

docker-images/artifacts/kafka-thirdparty-libs/3.5.x/pom.xml → docker-images/artifacts/kafka-thirdparty-libs/3.7.x/pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <strimzi-oauth.version>0.14.0</strimzi-oauth.version>
         <jayway-json-path.version>2.9.0</jayway-json-path.version>
-        <cruise-control.version>2.5.135</cruise-control.version>
+        <cruise-control.version>2.5.137</cruise-control.version>
         <opa-authorizer.version>1.5.1</opa-authorizer.version>
         <kafka-quotas-plugin.version>0.2.0</kafka-quotas-plugin.version>
         <kafka-mirror-maker-2-extensions.version>1.2.0</kafka-mirror-maker-2-extensions.version>
@@ -56,6 +56,9 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!--
+            Override guava version coming from org.openpolicyagent.kafka:opa-authorizer
+            -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -296,6 +299,14 @@
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- Mirror Maker 2 Extensions -->
@@ -332,8 +343,28 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- Excluded and imported separately to keep the Jackson version in sync with Kafka -->
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-yaml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- Excluded and imported separately to keep the Jackson version in sync with Kafka -->
+                    <groupId>com.fasterxml.jackson.datatype</groupId>
+                    <artifactId>jackson-datatype-jsr310</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.16.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.16.0</version>
+        </dependency>
         <!-- EnvVar Configuration Provider for Apache Kafka -->
         <dependency>
             <groupId>io.strimzi</groupId>

docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml

@@ -16,7 +16,7 @@
     </licenses>
 
     <properties>
-        <cruise-control.version>2.5.135</cruise-control.version>
+        <cruise-control.version>2.5.137</cruise-control.version>
     </properties>
 
     <repositories>

documentation/modules/snip-images.adoc

@@ -6,9 +6,9 @@
 
 |Kafka
 a|
-* {DockerOrg}/kafka:{DockerTag}-kafka-3.5.2
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.6.0
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.6.1
+* {DockerOrg}/kafka:{DockerTag}-kafka-3.7.0
 
 a|
 Strimzi image for running Kafka, including:

documentation/modules/snip-kafka-versions.adoc

@@ -6,7 +6,7 @@
 [options="header"]
 |=================
 |Kafka version |Inter-broker protocol version |Log message format version| ZooKeeper version
-| 3.5.2 | 3.5 | 3.5 | 3.6.4
 | 3.6.0 | 3.6 | 3.6 | 3.8.2
 | 3.6.1 | 3.6 | 3.6 | 3.8.3
+| 3.7.0 | 3.7 | 3.7 | 3.8.3
 |=================

documentation/shared/attributes.adoc

@@ -23,18 +23,18 @@
 :KubernetesVersion: 1.23 and later
 
 // Kafka upgrade attributes used in kafka upgrades section
-:DefaultKafkaVersion: 3.6.1
-:DefaultKafkaMetadataVersion: 3.6
-:KafkaMetadataVersionLower: 3.5-IV2
-:KafkaMetadataVersionHigher: 3.6-IV2
-:KafkaVersionLower: 3.5.1
-:KafkaVersionHigher: 3.6.1
+:DefaultKafkaVersion: 3.7.0
+:DefaultKafkaMetadataVersion: 3.7
+:KafkaMetadataVersionLower: 3.6-IV2
+:KafkaMetadataVersionHigher: 3.7-IV4
+:KafkaVersionLower: 3.6.1
+:KafkaVersionHigher: 3.7.0
 :ExampleImageTagUpgrades: quay.io/strimzi/kafka:{ProductVersion}-kafka-{KafkaVersionHigher}
 
 //inter-broker protocol and log message version
-:DefaultInterBrokerVersion: 3.6
-:InterBrokerVersionLower: 3.5
-:InterBrokerVersionHigher: 3.6
+:DefaultInterBrokerVersion: 3.7
+:InterBrokerVersionLower: 3.6
+:InterBrokerVersionHigher: 3.7
 
 // Bridge version
 :BridgeVersion: 0.27.0

documentation/shared/version-dependent-attrs.adoc

@@ -1,3 +1,3 @@
 // Generated by documentation/version-dependent-attrs.sh during the build
 // DO NOT EDIT BY HAND
-:DefaultKafkaVersion: 3.6.1
+:DefaultKafkaVersion: 3.7.0

kafka-versions.yaml

@@ -283,7 +283,7 @@
   checksum: 229CCC5E3E6B3B9845F59F6E829D70711C5A5A2293F32B6BCABC37350666F874BC7D8F08130F712A1B32915205C10F2847F04908C20D5F7FDB4B62D058C9DEFE
   zookeeper: 3.6.4
   third-party-libs: 3.5.x
-  supported: true
+  supported: false
   default: false
 - version: 3.6.0
   format: 3.6
@@ -304,4 +304,14 @@
   zookeeper: 3.8.3
   third-party-libs: 3.6.x
   supported: true
+  default: false
+- version: 3.7.0
+  format: 3.7
+  protocol: 3.7
+  metadata: 3.7
+  url: https://archive.apache.org/dist/kafka/3.7.0/kafka_2.13-3.7.0.tgz
+  checksum: B8679283A2D8DAB86E7C636B2C688FE9D9E64AC437241F65EF7A1733F4D26A2BD415EEFA04F09F1911373BCD2A5DBC3838C76347F68656425C09202CD290CE91
+  zookeeper: 3.8.3
+  third-party-libs: 3.7.x
+  supported: true
   default: true

packaging/examples/connect/kafka-connect-build.yaml

@@ -8,7 +8,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:
@@ -33,11 +33,11 @@ spec:
       # it should not happen that you pull someone else's container image. However, we
       # recommend changing this to your own container registry or using a different
       # image name for any other than demo purposes.
-      image: ttl.sh/strimzi-connect-example-3.6.1:24h
+      image: ttl.sh/strimzi-connect-example-3.7.0:24h
     plugins:
       - name: kafka-connect-file
         artifacts:
           - type: maven
             group: org.apache.kafka
             artifact: connect-file
-            version: 3.6.1
+            version: 3.7.0

packaging/examples/connect/kafka-connect.yaml

@@ -8,7 +8,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

packaging/examples/cruise-control/kafka-cruise-control-with-goals.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:

packaging/examples/cruise-control/kafka-cruise-control.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:

packaging/examples/kafka/kafka-ephemeral-single.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:

packaging/examples/kafka/kafka-ephemeral.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:

packaging/examples/kafka/kafka-jbod.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:

packaging/examples/kafka/kafka-persistent-single.yaml

@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes: