diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d78ba242bf..b4ff127fd3f 100644 --- 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 index 8f6780bb8c7..d8aeec38664 100644 --- 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 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/config-model-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java b/config-model-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java index 9b7420ff718..7f724242a44 100644 --- a/config-model-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java +++ b/config-model-generator/src/main/java/io/strimzi/build/kafka/metadata/KafkaConfigModelGenerator.java @@ -136,10 +136,12 @@ private static Map 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 index 9fbb2b8a2fa..294eca71e55 100644 --- 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 index 0654e2f450c..1e3ef1095df 100644 --- 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 index 44db1ed1a97..17818d8ee34 100644 --- 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 index 5e686cdbd2d..46dc9f075d6 100644 --- 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 index e9ca19c07ed..92e4dac85fc 100644 --- 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://archive.apache.org/dist/kafka/3.8.1/kafka_2.13-3.8.1.tgz + checksum: B43FADA353B7DCA51C0F90ACF594EC1CE06B2344C046D4059D4DEAB0615E0E3E76E92ECCDBDFA1ADAD1FBDE76C5F25E71ACD0DB013FB4B1778827448B5285EDF + zookeeper: 3.8.4 + third-party-libs: 3.8.x + supported: true default: true \ No newline at end of file diff --git a/packaging/examples/connect/kafka-connect-build.yaml b/packaging/examples/connect/kafka-connect-build.yaml index d85ae7bc6c0..76347351ccd 100644 --- 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 index b52eedc5fc1..71585637b26 100644 --- 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 index 712cdda8328..341eaa100ef 100644 --- 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 index e4909b78b54..f9764b3a2ff 100644 --- 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 index 0fc8051a387..22d49329575 100644 --- 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 index 8d0b9377fa8..01976863fcb 100644 --- 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 index 7dc41ff1a17..26d404db676 100644 --- 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 index 321ebaa3926..c4853d6e29c 100644 --- 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 index cb1ffdce8af..49c591bbb1f 100644 --- 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 index dcec81416f7..ec5da820737 100644 --- 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 index 3811a75f063..84180e3c425 100644 --- 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 index a210f3ff356..d895f74178a 100644 --- 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 index 9e8c7ccd8f7..80bdc6e91c3 100644 --- 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 index 8ba85270117..8d871b39a60 100644 --- 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 index 2720a6c0c0d..15b6a495bf0 100644 --- 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 index 1367a45c566..67e07fcebfa 100644 --- 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 index a92d5ef6dd4..c9c193d44ba 100644 --- 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 index 323f8a50fe4..a64c129458c 100644 --- 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 index 50d6401ae15..ac0f5ec7661 100644 --- 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 index aba1da3ce18..3058a225298 100644 --- 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 index 7ff097e84ee..f34e69c4be8 100644 --- 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 index bf78aae2afd..0a3b0569cb9 100644 --- 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 index 4e509fcf383..96592a12bcc 100644 --- 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 index 4106948424b..f575c198353 100644 --- 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 index c2efe3a703b..480f3309e24 100644 --- 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 index 04246f35297..eb14937894f 100644 --- 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 index c381610b8c5..7175104b4a1 100644 --- 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 index 43ede887f34..ae58cbdcb66 100644 --- 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/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml b/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml index 0dddb964102..dbc5ad9ce75 100644 --- a/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml +++ b/packaging/examples/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/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml b/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml index c61b0d167f6..0df4d2647e5 100644 --- a/packaging/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml +++ b/packaging/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 index db55946f969..e1254402fa5 100644 --- 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 index 9b02e319ddb..fdda93c19c3 100644 --- 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 diff --git a/packaging/examples/security/scram-sha-512-auth/mirror-maker-2.yaml b/packaging/examples/security/scram-sha-512-auth/mirror-maker-2.yaml index a4dd87c5cb6..0effa98d10b 100644 --- a/packaging/examples/security/scram-sha-512-auth/mirror-maker-2.yaml +++ b/packaging/examples/security/scram-sha-512-auth/mirror-maker-2.yaml @@ -4,7 +4,7 @@ metadata: name: cluster-a spec: kafka: - version: 3.8.0 + version: 3.8.1 replicas: 1 listeners: - name: tls @@ -46,7 +46,7 @@ metadata: name: cluster-b spec: kafka: - version: 3.8.0 + version: 3.8.1 replicas: 1 listeners: - name: tls @@ -218,7 +218,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/security/tls-auth/connect.yaml b/packaging/examples/security/tls-auth/connect.yaml index a315b1cb379..5df616dacd3 100644 --- a/packaging/examples/security/tls-auth/connect.yaml +++ b/packaging/examples/security/tls-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/tls-auth/kafka.yaml b/packaging/examples/security/tls-auth/kafka.yaml index cce0ae9b44d..73b83f3887f 100644 --- a/packaging/examples/security/tls-auth/kafka.yaml +++ b/packaging/examples/security/tls-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 diff --git a/packaging/examples/security/tls-auth/mirror-maker-2.yaml b/packaging/examples/security/tls-auth/mirror-maker-2.yaml index 7e963db9a40..99636ea1a49 100644 --- a/packaging/examples/security/tls-auth/mirror-maker-2.yaml +++ b/packaging/examples/security/tls-auth/mirror-maker-2.yaml @@ -4,7 +4,7 @@ metadata: name: cluster-a spec: kafka: - version: 3.8.0 + version: 3.8.1 replicas: 1 listeners: - name: tls @@ -46,7 +46,7 @@ metadata: name: cluster-b spec: kafka: - version: 3.8.0 + version: 3.8.1 replicas: 1 listeners: - name: tls @@ -209,7 +209,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/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/packaging/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl index 8b93709939b..a5faa804a4f 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl @@ -6,27 +6,31 @@ {{/* Generate the kafka image map */}} {{- define "strimzi.kafka.image.map" }} - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.8.0")) }} + value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.8.1")) }} - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.8.0")) }} + value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.8.1")) }} - name: STRIMZI_KAFKA_IMAGES value: | 3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.7.0")) }} 3.7.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.7.1")) }} 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.8.0")) }} + 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.8.1")) }} - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | 3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.7.0")) }} 3.7.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.7.1")) }} 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.8.0")) }} + 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.8.1")) }} - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | 3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.7.0")) }} 3.7.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.7.1")) }} 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.8.0")) }} + 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.8.1")) }} - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | 3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.7.0")) }} 3.7.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.7.1")) }} 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.8.0")) }} + 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.8.1")) }} {{- end -}} diff --git a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index 64d50fd8a39..2559382f796 100644 --- a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -48,29 +48,33 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: quay.io/strimzi/kafka:latest-kafka-3.8.0 + value: quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: quay.io/strimzi/kafka:latest-kafka-3.8.0 + value: quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_KAFKA_IMAGES value: | 3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0 3.7.1=quay.io/strimzi/kafka:latest-kafka-3.7.1 3.8.0=quay.io/strimzi/kafka:latest-kafka-3.8.0 + 3.8.1=quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | 3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0 3.7.1=quay.io/strimzi/kafka:latest-kafka-3.7.1 3.8.0=quay.io/strimzi/kafka:latest-kafka-3.8.0 + 3.8.1=quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | 3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0 3.7.1=quay.io/strimzi/kafka:latest-kafka-3.7.1 3.8.0=quay.io/strimzi/kafka:latest-kafka-3.8.0 + 3.8.1=quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | 3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0 3.7.1=quay.io/strimzi/kafka:latest-kafka-3.7.1 3.8.0=quay.io/strimzi/kafka:latest-kafka-3.8.0 + 3.8.1=quay.io/strimzi/kafka:latest-kafka-3.8.1 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE value: quay.io/strimzi/operator:latest - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE diff --git a/pom.xml b/pom.xml index bfef1f7a9d2..d3e84774deb 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 2.16.2 4.5.10 4.5.10 - 3.8.0 + 3.8.1 2.2.0 3.8.4 1.1.10.5 diff --git a/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml b/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml index b3a7eae37fe..70e23d8b04b 100644 --- a/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml +++ b/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml @@ -36,8 +36,8 @@ fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.44.0/kafka-versions.yaml additionalTopics: 2 imagesAfterOperations: - zookeeper: strimzi/kafka:latest-kafka-3.8.0 - kafka: strimzi/kafka:latest-kafka-3.8.0 + zookeeper: strimzi/kafka:latest-kafka-3.8.1 + kafka: strimzi/kafka:latest-kafka-3.8.1 topicOperator: strimzi/operator:latest userOperator: strimzi/operator:latest client: