Skip to content

Commit 50c8b45

Browse files
scholzjscholzj
authored
Remove old Kafka versions and describe our rules for supported Kafka versions (strimzi#1990)
* Remove old Kafka versions and describe our rules for supported Kafka versions Signed-off-by: Jakub Scholz <[email protected]> * Update CHANGELOG.md Signed-off-by: Jakub Scholz <[email protected]> * Update docu for new versions Signed-off-by: Jakub Scholz <[email protected]> * Fix tests, review comments Signed-off-by: Jakub Scholz <[email protected]>
1 parent b0e583e commit 50c8b45

File tree

10 files changed

+18
-107
lines changed

10 files changed

+18
-107
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 0.15.0
4+
5+
* Drop support for Kafka 2.1.0, 2.1.1, and 2.2.0
6+
37
## 0.14.0
48

59
* Add support for configuring Ingress class (#1716)

‎HACKING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ If you want to use your own images with different tag or from different reposito
267267
268268
#### Specific Kafka version
269269
270-
To set custom Kafka version in system tests need to add system property `ST_KAFKA_VERSION` with one of the following values: `2.1.0`, `2.1.1`, `2.2.0`, `2.2.1`, `2.3.0`. For more info about allowed versions see [kafka-versions](https://github.com/strimzi/strimzi-kafka-operator/blob/master/kafka-versions).
270+
To set custom Kafka version in system tests need to add system property `ST_KAFKA_VERSION` to one of the values in [kafka-versions](https://github.com/strimzi/strimzi-kafka-operator/blob/master/kafka-versions).
271271
272272
#### Cluster Operator Log level
273273

‎KAFKA_VERSION_SUPPORT.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Supported Apache Kafka versions
2+
3+
It is not feasible to maintain support for all available Apache Kafka versions.
4+
The following rules describe our plans for Kafka versions supported in Strimzi:
5+
6+
* Support at least the last two major/minor versions of Apache Kafka. _For example: Support for Kafka 2.2.x could be removed when support for 2.4.x is added._
7+
* Support at least one common Kafka release in two consecutive major/minor Strimzi releases to allow smooth upgrades between Strimzi and Kafka versions. _For example: when Strimzi 0.13.x supports Kafka 2.2.0 and 2.3.0, Strimzi 0.14.x has to provide support for 2.3.0 as well._

‎cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaVersionTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public class KafkaVersionTest {
2020
@Test
2121
public void load() {
2222
KafkaVersion.Lookup loaded = new KafkaVersion.Lookup(emptyMap(), emptyMap(), emptyMap(), emptyMap());
23-
assertTrue(loaded.supportedVersions().contains("2.1.0"));
24-
assertTrue(loaded.supportedVersions().contains("2.1.1"));
25-
assertTrue(loaded.supportedVersions().contains("2.2.0"));
2623
assertTrue(loaded.supportedVersions().contains("2.2.1"));
2724
assertTrue(loaded.supportedVersions().contains("2.3.0"));
28-
assertEquals("2.1.1", loaded.version("2.1.1").version());
29-
assertEquals("2.1", loaded.version("2.1.1").protocolVersion());
30-
assertEquals("2.1", loaded.version("2.1.1").messageVersion());
25+
assertEquals("2.2.1", loaded.version("2.2.1").version());
26+
assertEquals("2.2", loaded.version("2.2.1").protocolVersion());
27+
assertEquals("2.2", loaded.version("2.2.1").messageVersion());
28+
assertEquals("2.3.0", loaded.version("2.3.0").version());
29+
assertEquals("2.3", loaded.version("2.3.0").protocolVersion());
30+
assertEquals("2.3", loaded.version("2.3.0").messageVersion());
3131
}
3232

3333
@Test

‎docker-images/kafka/kafka-thirdparty-libs/2.1.x/pom.xml

-67
This file was deleted.

‎documentation/book/snip-images.adoc

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
|Kafka
88
a|
9-
* {DockerOrg}/kafka:{DockerTag}-kafka-2.1.0
10-
* {DockerOrg}/kafka:{DockerTag}-kafka-2.1.1
11-
* {DockerOrg}/kafka:{DockerTag}-kafka-2.2.0
129
* {DockerOrg}/kafka:{DockerTag}-kafka-2.2.1
1310
* {DockerOrg}/kafka:{DockerTag}-kafka-2.3.0
1411

‎documentation/book/snip-kafka-versions.adoc

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
[options="header"]
77
|=================
88
|Kafka version |Interbroker protocol version |Log message format version| Zookeeper version
9-
|2.1.0 |2.1 |2.1 |3.4.13
10-
|2.1.1 |2.1 |2.1 |3.4.13
11-
|2.2.0 |2.2 |2.2 |3.4.13
129
|2.2.1 |2.2 |2.2 |3.4.13
1310
|2.3.0 |2.3 |2.3 |3.4.13
1411
|=================

‎helm-charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl

-12
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,18 @@
1717
value: {{ default .Values.kafkaExporter.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaExporter.image.name }}:{{ default .Values.kafkaExporter.image.tagPrefix .Values.imageTagOverride }}-kafka-2.3.0
1818
- name: STRIMZI_KAFKA_IMAGES
1919
value: |
20-
2.1.0={{ default .Values.kafka.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafka.image.name }}:{{ default .Values.kafka.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.0
21-
2.1.1={{ default .Values.kafka.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafka.image.name }}:{{ default .Values.kafka.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.1
22-
2.2.0={{ default .Values.kafka.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafka.image.name }}:{{ default .Values.kafka.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.0
2320
2.2.1={{ default .Values.kafka.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafka.image.name }}:{{ default .Values.kafka.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.1
2421
2.3.0={{ default .Values.kafka.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafka.image.name }}:{{ default .Values.kafka.image.tagPrefix .Values.imageTagOverride }}-kafka-2.3.0
2522
- name: STRIMZI_KAFKA_CONNECT_IMAGES
2623
value: |
27-
2.1.0={{ default .Values.kafkaConnect.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnect.image.name }}:{{ default .Values.kafkaConnect.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.0
28-
2.1.1={{ default .Values.kafkaConnect.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnect.image.name }}:{{ default .Values.kafkaConnect.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.1
29-
2.2.0={{ default .Values.kafkaConnect.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnect.image.name }}:{{ default .Values.kafkaConnect.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.0
3024
2.2.1={{ default .Values.kafkaConnect.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnect.image.name }}:{{ default .Values.kafkaConnect.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.1
3125
2.3.0={{ default .Values.kafkaConnect.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnect.image.name }}:{{ default .Values.kafkaConnect.image.tagPrefix .Values.imageTagOverride }}-kafka-2.3.0
3226
- name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES
3327
value: |
34-
2.1.0={{ default .Values.kafkaConnects2i.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnects2i.image.name }}:{{ default .Values.kafkaConnects2i.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.0
35-
2.1.1={{ default .Values.kafkaConnects2i.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnects2i.image.name }}:{{ default .Values.kafkaConnects2i.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.1
36-
2.2.0={{ default .Values.kafkaConnects2i.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnects2i.image.name }}:{{ default .Values.kafkaConnects2i.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.0
3728
2.2.1={{ default .Values.kafkaConnects2i.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnects2i.image.name }}:{{ default .Values.kafkaConnects2i.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.1
3829
2.3.0={{ default .Values.kafkaConnects2i.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaConnects2i.image.name }}:{{ default .Values.kafkaConnects2i.image.tagPrefix .Values.imageTagOverride }}-kafka-2.3.0
3930
- name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
4031
value: |
41-
2.1.0={{ default .Values.kafkaMirrorMaker.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaMirrorMaker.image.name }}:{{ default .Values.kafkaMirrorMaker.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.0
42-
2.1.1={{ default .Values.kafkaMirrorMaker.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaMirrorMaker.image.name }}:{{ default .Values.kafkaMirrorMaker.image.tagPrefix .Values.imageTagOverride }}-kafka-2.1.1
43-
2.2.0={{ default .Values.kafkaMirrorMaker.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaMirrorMaker.image.name }}:{{ default .Values.kafkaMirrorMaker.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.0
4432
2.2.1={{ default .Values.kafkaMirrorMaker.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaMirrorMaker.image.name }}:{{ default .Values.kafkaMirrorMaker.image.tagPrefix .Values.imageTagOverride }}-kafka-2.2.1
4533
2.3.0={{ default .Values.kafkaMirrorMaker.image.repository .Values.imageRepositoryOverride }}/{{ .Values.kafkaMirrorMaker.image.name }}:{{ default .Values.kafkaMirrorMaker.image.tagPrefix .Values.imageTagOverride }}-kafka-2.3.0
4634
{{- end -}}

‎install/cluster-operator/050-Deployment-strimzi-cluster-operator.yaml

-12
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,18 @@ spec:
4444
value: strimzi/kafka:latest-kafka-2.3.0
4545
- name: STRIMZI_KAFKA_IMAGES
4646
value: |
47-
2.1.0=strimzi/kafka:latest-kafka-2.1.0
48-
2.1.1=strimzi/kafka:latest-kafka-2.1.1
49-
2.2.0=strimzi/kafka:latest-kafka-2.2.0
5047
2.2.1=strimzi/kafka:latest-kafka-2.2.1
5148
2.3.0=strimzi/kafka:latest-kafka-2.3.0
5249
- name: STRIMZI_KAFKA_CONNECT_IMAGES
5350
value: |
54-
2.1.0=strimzi/kafka:latest-kafka-2.1.0
55-
2.1.1=strimzi/kafka:latest-kafka-2.1.1
56-
2.2.0=strimzi/kafka:latest-kafka-2.2.0
5751
2.2.1=strimzi/kafka:latest-kafka-2.2.1
5852
2.3.0=strimzi/kafka:latest-kafka-2.3.0
5953
- name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES
6054
value: |
61-
2.1.0=strimzi/kafka:latest-kafka-2.1.0
62-
2.1.1=strimzi/kafka:latest-kafka-2.1.1
63-
2.2.0=strimzi/kafka:latest-kafka-2.2.0
6455
2.2.1=strimzi/kafka:latest-kafka-2.2.1
6556
2.3.0=strimzi/kafka:latest-kafka-2.3.0
6657
- name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
6758
value: |
68-
2.1.0=strimzi/kafka:latest-kafka-2.1.0
69-
2.1.1=strimzi/kafka:latest-kafka-2.1.1
70-
2.2.0=strimzi/kafka:latest-kafka-2.2.0
7159
2.2.1=strimzi/kafka:latest-kafka-2.2.1
7260
2.3.0=strimzi/kafka:latest-kafka-2.3.0
7361
- name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE

‎kafka-versions

-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@
2323
# version default proto msg sha512 third-party-libs
2424
#1.0.2 1.0 1.0 4CBCDAF8CCC4EFE3D1B6275F3F2C32CF8F2F1A62104B5DD0BD9E2974160AB89D85A6E1791AF8B948A413B99ED696B06EA9D4299B27EA63C3F7318DABF5761144 1.0.x
2525
#1.1.1 1.1 1.1 2A1EB9A7C8C8337C424EEFED7BAAE26B3DACBA6A4AB8B64D9A7D5C6EE2CDB66CFA76C5B366F23435941569B89BF02482625189016296B2EA2A05FD0F38F6B709 1.1.x
26-
2.1.0 2.1 2.1 05A07E928C439B1084A6B3F6835F067F9636AC47F9473DCAAF7040D339CBD0A4561B7478531B237AA69E27F50FE3A2E7F4D0F2BA99A6422592A89ECF1187FA25 2.1.x
27-
2.1.1 2.1 2.1 A2E8168E8DE6B45E8FCA1F2883F0744D3C5A939B70D8A47A5428B72188501D4C2FC11BC35759F2392680D4E8ECF2FA9D0E518E77FD28393AFBA22194AD018B10 2.1.x
28-
2.2.0 2.2 2.2 63FDCD05B857A096D2E72804253590BD086E4F3046FBFA546F186602E48F54712ED6DE2A346A5B05D5335870BF5268FCB2BFD3EF9C4F4BBEA379091A79604556 2.2.x
2926
2.2.1 2.2 2.2 B8D828F06DFE59E34C4CFA20C57C8C8B43374F1E7C09F12DFA5433534A380BFE09A6DE90FB86A4403939A87AB9C665E2369143C138C71391B01BBB9B384E7AC5 2.2.x
3027
2.3.0 default 2.3 2.3 A5ED591AB304A1F16F7FD64183871E38AABF814A2C1CA86BB3D064C83E85A6463D3C55F4D707A29FC3D7994DD7BA1F790B5A6219C6DFFDF472AFD99CEE37892E 2.3.x

0 commit comments

Comments
 (0)