Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove support for Kafka 3.5.0 and 3.5.1 #9526

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Remove support for Kafka 3.5.0 and 3.5.1 #9526

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd8071
Remove support for Kafka 3.5.0 and 3.5.1
scholzj Dec 22, 2023
3592f86
Review comments LK
scholzj Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cluster-operator/src/test/java/io/strimzi/operator/cluster/KafkaVersionTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 0 additions & 2 deletions documentation/modules/snip-images.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions documentation/modules/snip-kafka-versions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions kafka-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 0 additions & 8 deletions packaging/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) }}
Expand Down
8 changes: 0 additions & 8 deletions packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down