Remove support for Kafka 3.5.0 and 3.5.1 (#9526)

Signed-off-by: Jakub Scholz <www@scholzj.com>
strimzi · Jan 9, 2024 · 2b16ae7 · 2b16ae7
1 parent d796434
commit 2b16ae7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.40.0
 
+* Remove support for Apache Kafka 3.5.0 and 3.5.1
 * Fix NullPointerException from missing listenerConfig when using custom auth
 * Added support for Kafka Exporter `offset.show-all` parameter
 

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
@@ -33,7 +33,7 @@ public class KafkaVersionTestUtils {
     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.1";
+    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";

diff --git a/documentation/modules/snip-images.adoc b/documentation/modules/snip-images.adoc
@@ -6,8 +6,6 @@
 
 |Kafka
 a|
-* {DockerOrg}/kafka:{DockerTag}-kafka-3.5.0
-* {DockerOrg}/kafka:{DockerTag}-kafka-3.5.1
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.5.2
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.6.0
 * {DockerOrg}/kafka:{DockerTag}-kafka-3.6.1

diff --git a/documentation/modules/snip-kafka-versions.adoc b/documentation/modules/snip-kafka-versions.adoc
@@ -6,8 +6,6 @@
 [options="header"]
 |=================
 |Kafka version |Inter-broker protocol version |Log message format version| ZooKeeper version
-| 3.5.0 | 3.5 | 3.5 | 3.6.4
-| 3.5.1 | 3.5 | 3.5 | 3.6.4
 | 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

diff --git a/kafka-versions.yaml b/kafka-versions.yaml
@@ -263,7 +263,7 @@
   checksum: 7B79BD0844DB683C06C3491955BB183D48A47FA4639D2E241B9F4FF4060C4B70814DAC7D96BEA87DFFCA0C8AE038278C4FABF68D4EA1194228D67D9C3B1D247C
   zookeeper: 3.6.4
   third-party-libs: 3.5.x
-  supported: true
+  supported: false
   default: false
 - version: 3.5.1
   format: 3.5
@@ -273,7 +273,7 @@
   checksum: B6CEB010A5FE1791843CBC53D34D35993E97E03F9518344B4B5BDF7146D0A4E866CD2D4760CAB319D8B3323A5BF53037A78FED88C9384381AEA2CD0366877763
   zookeeper: 3.6.4
   third-party-libs: 3.5.x
-  supported: true
+  supported: false
   default: false
 - version: 3.5.2
   format: 3.5

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
@@ -13,29 +13,21 @@
               value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.6.1")) }}
             - name: STRIMZI_KAFKA_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.1")) }}
                 3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.6.1")) }}
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.1")) }}
                 3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.6.1")) }}
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.1")) }}
                 3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.6.1")) }}
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.1")) }}
                 3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.6.1")) }}

diff --git a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -55,29 +55,21 @@ spec:
               value: quay.io/strimzi/kafka:latest-kafka-3.6.1
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:latest-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:latest-kafka-3.5.1
                 3.5.2=quay.io/strimzi/kafka:latest-kafka-3.5.2
                 3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
                 3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:latest-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:latest-kafka-3.5.1
                 3.5.2=quay.io/strimzi/kafka:latest-kafka-3.5.2
                 3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
                 3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:latest-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:latest-kafka-3.5.1
                 3.5.2=quay.io/strimzi/kafka:latest-kafka-3.5.2
                 3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
                 3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:latest-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:latest-kafka-3.5.1
                 3.5.2=quay.io/strimzi/kafka:latest-kafka-3.5.2
                 3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
                 3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1

diff --git a/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml b/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml
@@ -34,8 +34,8 @@
   fromKafkaVersionsUrl: HEAD
   additionalTopics: 2
   imagesAfterOperations:
-    zookeeper: strimzi/kafka:0.39.0-kafka-3.5.0
-    kafka: strimzi/kafka:0.39.0-kafka-3.5.0
+    zookeeper: strimzi/kafka:0.39.0-kafka-3.5.2
+    kafka: strimzi/kafka:0.39.0-kafka-3.5.2
     topicOperator: strimzi/operator:0.39.0
     userOperator: strimzi/operator:0.39.0
   deployKafkaVersion: 3.6.1
@@ -57,8 +57,8 @@
   fromKafkaVersionsUrl: HEAD
   additionalTopics: 2
   imagesAfterOperations:
-    zookeeper: strimzi/kafka:0.39.0-kafka-3.5.0
-    kafka: strimzi/kafka:0.39.0-kafka-3.5.0
+    zookeeper: strimzi/kafka:0.39.0-kafka-3.5.2
+    kafka: strimzi/kafka:0.39.0-kafka-3.5.2
     topicOperator: strimzi/operator:0.39.0
     userOperator: strimzi/operator:0.39.0
   deployKafkaVersion: 3.6.1

diff --git a/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml b/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml
@@ -26,7 +26,7 @@
 
 - fromVersion: 0.39.0
   fromExamples: strimzi-0.39.0
-  oldestKafka: 3.5.0
+  oldestKafka: 3.5.2
   fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
   fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.39.0/kafka-versions.yaml
   additionalTopics: 2
@@ -46,7 +46,7 @@
   featureGatesAfter: ""
 - fromVersion: 0.39.0
   fromExamples: strimzi-0.39.0
-  oldestKafka: 3.5.0
+  oldestKafka: 3.5.2
   fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
   fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.39.0/kafka-versions.yaml
   additionalTopics: 2