Add support for Kafka 3.8.1

Signed-off-by: Jakub Scholz <[email protected]>
strimzi · Oct 28, 2024 · 57dd8a3 · 57dd8a3
1 parent 86d8fae
commit 57dd8a3
Show file tree

Hide file tree

Showing 49 changed files with 87 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.45.0
 
+* Add support for Kafka 3.8.1
 
 ## 0.44.0
 

diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/KafkaVersionTestUtils.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/KafkaVersionTestUtils.java
@@ -21,7 +21,7 @@ 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.8.0";
+    public static final String LATEST_KAFKA_VERSION = "3.8.1";
     public static final String LATEST_FORMAT_VERSION = "3.8";
     public static final String LATEST_PROTOCOL_VERSION = "3.8";
     public static final String LATEST_METADATA_VERSION = "3.8-IV0";

diff --git a/...el-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java b/...el-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java
@@ -136,10 +136,12 @@ private static Map<String, ConfigModel> configs(String version) throws NoSuchMet
                 continue;
             } else if (key.validator != null && "class org.apache.kafka.raft.QuorumConfig$ControllerQuorumBootstrapServersValidator".equals(key.validator.getClass().toString()))   { // we compare the class names because of changes done between Kafka version 3.7 and 3.8 => this is for Kafka 3.8 and newer
                 continue;
-            } else if (key.validator != null && "class org.apache.kafka.common.compress.GzipCompression$LevelValidator".equals(key.validator.getClass().toString()))   { // we compare the class names because of changes done between Kafka version 3.7 and 3.8 => this is for Kafka 3.8 and newer
+            } else if (key.validator != null && "class org.apache.kafka.common.compress.GzipCompression$LevelValidator".equals(key.validator.getClass().toString()))   { // we compare the class names because of changes done between Kafka version 3.7 and 3.8 => this is for Kafka 3.8.0
+                descriptor.setPattern("[1-9]{1}|-1");
+            } else if (key.validator != null && "class org.apache.kafka.common.record.CompressionType$1$1".equals(key.validator.getClass().toString()) && configName.equals("compression.gzip.level"))   { // we compare the class names because of changes done between Kafka version 3.8.0 and 3.8.1 => this is for Kafka 3.8.1 and newer. Given it is an anonymous class, we also check the field name to protect against some changes
                 descriptor.setPattern("[1-9]{1}|-1");
             } else if (key.validator != null) {
-                throw new IllegalStateException("Invalid validator class " + key.validator.getClass() + " for option " + configName);
+                throw new IllegalStateException("Invalid validator '" + key.validator.getClass() + "' for option '" + configName + "'");
             }
 
             result.put(configName, descriptor);

diff --git a/documentation/modules/snip-images.adoc b/documentation/modules/snip-images.adoc
@@ -9,6 +9,7 @@ a|
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.7.0
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.7.1
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.8.0
+* {DockerOrg}/kafka:{DockerTag}-kafka-3.8.1
 
 a|
 Strimzi image for running Kafka, including:

diff --git a/documentation/modules/snip-kafka-versions.adoc b/documentation/modules/snip-kafka-versions.adoc
@@ -9,4 +9,5 @@
 | 3.7.0 | 3.7 | 3.7 | 3.8.3
 | 3.7.1 | 3.7 | 3.7 | 3.8.4
 | 3.8.0 | 3.8 | 3.8 | 3.8.4
+| 3.8.1 | 3.8 | 3.8 | 3.8.4
 |=================
diff --git a/documentation/shared/attributes.adoc b/documentation/shared/attributes.adoc
@@ -23,12 +23,12 @@
 :KubernetesVersion: 1.25 and later
 
 // Kafka upgrade attributes used in kafka upgrades section
-:DefaultKafkaVersion: 3.8.0
+:DefaultKafkaVersion: 3.8.1
 :DefaultKafkaMetadataVersion: 3.8
 :KafkaMetadataVersionLower: 3.7-IV4
 :KafkaMetadataVersionHigher: 3.8-IV0
 :KafkaVersionLower: 3.7.0
-:KafkaVersionHigher: 3.8.0
+:KafkaVersionHigher: 3.8.1
 :ExampleImageTagUpgrades: quay.io/strimzi/kafka:{ProductVersion}-kafka-{KafkaVersionHigher}
 
 //inter-broker protocol and log message version

diff --git a/documentation/shared/version-dependent-attrs.adoc b/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.8.0
+:DefaultKafkaVersion: 3.8.1
diff --git a/kafka-versions.yaml b/kafka-versions.yaml
@@ -344,4 +344,14 @@
   zookeeper: 3.8.4
   third-party-libs: 3.8.x
   supported: true
+  default: false
+- version: 3.8.1
+  format: 3.8
+  protocol: 3.8
+  metadata: 3.8
+  url: https://dist.apache.org/repos/dist/dev/kafka/3.8.1-rc1/kafka_2.13-3.8.1.tgz
+  checksum: B43FADA353B7DCA51C0F90ACF594EC1CE06B2344C046D4059D4DEAB0615E0E3E76E92ECCDBDFA1ADAD1FBDE76C5F25E71ACD0DB013FB4B1778827448B5285EDF
+  zookeeper: 3.8.4
+  third-party-libs: 3.8.x
+  supported: true
   default: true
diff --git a/packaging/examples/connect/kafka-connect-build.yaml b/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.8.0
+  version: 3.8.1
   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.8.0:24h
+      image: ttl.sh/strimzi-connect-example-3.8.1:24h
     plugins:
       - name: kafka-connect-file
         artifacts:
           - type: maven
             group: org.apache.kafka
             artifact: connect-file
-            version: 3.8.0
+            version: 3.8.1
diff --git a/packaging/examples/connect/kafka-connect.yaml b/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.8.0
+  version: 3.8.1
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/packaging/examples/cruise-control/kafka-cruise-control-auto-rebalancing.yaml b/packaging/examples/cruise-control/kafka-cruise-control-auto-rebalancing.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/cruise-control/kafka-cruise-control-with-goals.yaml b/packaging/examples/cruise-control/kafka-cruise-control-with-goals.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/cruise-control/kafka-cruise-control.yaml b/packaging/examples/cruise-control/kafka-cruise-control.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-ephemeral-single.yaml b/packaging/examples/kafka/kafka-ephemeral-single.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-ephemeral.yaml b/packaging/examples/kafka/kafka-ephemeral.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-jbod.yaml b/packaging/examples/kafka/kafka-jbod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-persistent-single.yaml b/packaging/examples/kafka/kafka-persistent-single.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-persistent.yaml b/packaging/examples/kafka/kafka-persistent.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kafka-with-node-pools.yaml b/packaging/examples/kafka/kafka-with-node-pools.yaml
@@ -44,7 +44,7 @@ metadata:
     strimzi.io/node-pools: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     listeners:
       - name: plain
         port: 9092

diff --git a/packaging/examples/kafka/kraft/kafka-ephemeral.yaml b/packaging/examples/kafka/kraft/kafka-ephemeral.yaml
@@ -43,7 +43,7 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     metadataVersion: 3.8-IV0
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kraft/kafka-jbod.yaml b/packaging/examples/kafka/kraft/kafka-jbod.yaml
@@ -52,7 +52,7 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     metadataVersion: 3.8-IV0
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kraft/kafka-single-node.yaml b/packaging/examples/kafka/kraft/kafka-single-node.yaml
@@ -28,7 +28,7 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     metadataVersion: 3.8-IV0
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kraft/kafka-with-dual-role-nodes.yaml b/packaging/examples/kafka/kraft/kafka-with-dual-role-nodes.yaml
@@ -28,7 +28,7 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     metadataVersion: 3.8-IV0
     listeners:
       - name: plain

diff --git a/packaging/examples/kafka/kraft/kafka.yaml b/packaging/examples/kafka/kraft/kafka.yaml
@@ -47,7 +47,7 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     metadataVersion: 3.8-IV0
     listeners:
       - name: plain

diff --git a/packaging/examples/metrics/kafka-connect-metrics.yaml b/packaging/examples/metrics/kafka-connect-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: my-connect-cluster
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9092
   metricsConfig:

diff --git a/packaging/examples/metrics/kafka-cruise-control-metrics.yaml b/packaging/examples/metrics/kafka-cruise-control-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/metrics/kafka-metrics.yaml b/packaging/examples/metrics/kafka-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: plain

diff --git a/packaging/examples/metrics/kafka-mirror-maker-2-metrics.yaml b/packaging/examples/metrics/kafka-mirror-maker-2-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: my-mm2-cluster
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   connectCluster: "my-cluster-target"
   clusters:

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker-2.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker-2.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker-tls.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker-tls.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker
 metadata:
   name: my-mirror-maker
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   consumer:
     bootstrapServers: cluster-a-kafka-bootstrap:9093 # Source cluster

diff --git a/packaging/examples/mirror-maker/kafka-mirror-maker.yaml b/packaging/examples/mirror-maker/kafka-mirror-maker.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker
 metadata:
   name: my-mirror-maker
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   consumer:
     bootstrapServers: cluster-a-kafka-bootstrap:9092 # Source cluster

diff --git a/packaging/examples/mirror-maker/kafka-source.yaml b/packaging/examples/mirror-maker/kafka-source.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-a
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: plain

diff --git a/packaging/examples/mirror-maker/kafka-target.yaml b/packaging/examples/mirror-maker/kafka-target.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-b
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: plain

diff --git a/.../security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml b/.../security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: tls

diff --git a/...examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml b/...examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 1
     listeners:
       - name: tls

diff --git a/packaging/examples/security/scram-sha-512-auth/connect.yaml b/packaging/examples/security/scram-sha-512-auth/connect.yaml
@@ -66,7 +66,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.8.0
+  version: 3.8.1
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/packaging/examples/security/scram-sha-512-auth/kafka.yaml b/packaging/examples/security/scram-sha-512-auth/kafka.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.8.0
+    version: 3.8.1
     replicas: 3
     listeners:
       - name: tls