Skip to content

Commit

Permalink
Prepare for 0.40.0 release
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Scholz <[email protected]>
  • Loading branch information
scholzj committed Mar 8, 2024
1 parent 7d774f0 commit 1b5ce12
Show file tree
Hide file tree
Showing 99 changed files with 2,770 additions and 956 deletions.
6 changes: 3 additions & 3 deletions .checksums
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
# if this checksum has changed as part of any non-release specific changes, please apply your changes to the
# development version of the helm charts in ./packaging/helm-charts
### IMPORTANT ###
HELM_CHART_CHECKSUM="1aa3d3b4e4f260ac8368cf0c01ce4abb782d9910 -"
HELM_CHART_CHECKSUM="0415284e0da7c99be1a0a04c4afc419f090f90a3 -"

### IMPORTANT ###
# if the below line has changed, this means the ./install directory has changed
# the checksum and ./install directory should only be modified on official releases as part of a release
# if this checksum has changed as part of any non-release specific changes, please apply your changes to the
# development version of the helm charts in ./packaging/install
### IMPORTANT ###
INSTALL_CHECKSUM="a9682ec63cc2ccbe2a19f4b06ef0ba77a08c40ac -"
INSTALL_CHECKSUM="769dafc0e502c367f77cb7ae71dc65118cf431f3 -"

### IMPORTANT ###
# if the below line has changed, this means the ./examples directory has changed
# the checksum and ./examples directory should only be modified on official releases as part of a release
# if this checksum has changed as part of any non-release specific changes, please apply your changes to the
# development version of the helm charts in ./packaging/examples
### IMPORTANT ###
EXAMPLES_CHECKSUM="7f6f2f9a13f66b9d693760093b4ca645d6ec4e7b -"
EXAMPLES_CHECKSUM="382b62588b64435003e87f0bf88ffbcc01dff893 -"
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.strimzi</groupId>
<artifactId>strimzi</artifactId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion certificate-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>strimzi</artifactId>
<groupId>io.strimzi</groupId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>certificate-manager</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cluster-operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.strimzi</groupId>
<artifactId>strimzi</artifactId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cluster-operator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion config-model-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>strimzi</artifactId>
<groupId>io.strimzi</groupId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion config-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>strimzi</artifactId>
<groupId>io.strimzi</groupId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion crd-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>strimzi</artifactId>
<groupId>io.strimzi</groupId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion crd-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>strimzi</artifactId>
<groupId>io.strimzi</groupId>
<version>0.40.0-SNAPSHOT</version>
<version>0.40.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion documentation/shared/attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
:InterBrokerVersionHigher: 3.7

// Bridge version
:BridgeVersion: 0.27.0
:BridgeVersion: 0.28.0

// Drain Cleaner Version
:DrainCleanerVersion: 1.1.0
Expand Down
6 changes: 3 additions & 3 deletions examples/connect/kafka-connect-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
# # needing to call the Connect REST API directly
# strimzi.io/use-connector-resources: "true"
spec:
version: 3.6.1
version: 3.7.0
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
Expand All @@ -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.6.1:24h
image: ttl.sh/strimzi-connect-example-3.7.0:24h
plugins:
- name: kafka-connect-file
artifacts:
- type: maven
group: org.apache.kafka
artifact: connect-file
version: 3.6.1
version: 3.7.0
2 changes: 1 addition & 1 deletion examples/connect/kafka-connect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
# # needing to call the Connect REST API directly
# strimzi.io/use-connector-resources: "true"
spec:
version: 3.6.1
version: 3.7.0
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
Expand Down
4 changes: 2 additions & 2 deletions examples/cruise-control/kafka-cruise-control-with-goals.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 3
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: ephemeral
zookeeper:
Expand Down
4 changes: 2 additions & 2 deletions examples/cruise-control/kafka-cruise-control.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 3
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: ephemeral
zookeeper:
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka/kafka-ephemeral-single.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 1
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 1
default.replication.factor: 1
min.insync.replicas: 1
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: ephemeral
zookeeper:
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka/kafka-ephemeral.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 3
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: ephemeral
zookeeper:
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka/kafka-jbod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 3
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: jbod
volumes:
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka/kafka-persistent-single.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 1
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 1
default.replication.factor: 1
min.insync.replicas: 1
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: jbod
volumes:
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka/kafka-persistent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.6.1
version: 3.7.0
replicas: 3
listeners:
- name: plain
Expand All @@ -21,7 +21,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
inter.broker.protocol.version: "3.7"
storage:
type: jbod
volumes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ metadata:
spec:
kafka:
version: 3.6.1
# The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
replicas: 3
listeners:
- name: plain
port: 9092
Expand All @@ -63,16 +60,7 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.6"
# The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
storage:
type: jbod
volumes:
- id: 0
type: persistent-claim
size: 100Gi
deleteClaim: false
inter.broker.protocol.version: "3.7"
zookeeper:
replicas: 3
storage:
Expand Down
10 changes: 10 additions & 0 deletions examples/kafka/kraft/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# KRaft examples

The examples in this directory demonstrate how you can use Kraft (ZooKeeper-less Apache Kafka) with Strimzi.
* The [`kafka.yaml`](kafka.yaml) deploys a Kafka cluster with one pool of _KRaft controller_ nodes and one pool of _KRaft broker_ nodes.
* The [`kafka-ephemeral.yaml`](kafka-ephemeral.yaml) deploys a Kafka cluster with one pool of _KRaft controller_ nodes, one pool of _KRaft broker_ nodes and ephemeral storage.
* The [`kafka-with-dual-role-nodes.yaml`](kafka-with-dual-role-nodes.yaml) deploys a Kafka cluster with one pool of KRaft nodes that share the _broker_ and _controller_ roles.

To use KRaft, ensure that the `KafkaNodePools` and `UseKRaft` feature gates are not disabled.
Please note that ZooKeeper-less Apache Kafka is still under development and lacks some critical features.
For instance, JBOD storage is not supported (you can specify `type: jbod` storage in Strimzi custom resources, but it should contain only a single volume).
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.6.1
metadataVersion: 3.6-IV2
# The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
replicas: 3
version: 3.7.0
metadataVersion: 3.7-IV4
listeners:
- name: plain
port: 9092
Expand All @@ -55,15 +52,6 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
# The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
storage:
type: ephemeral
# The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
# But it will be ignored when running in KRaft mode
zookeeper:
replicas: 3
storage:
type: ephemeral
entityOperator:
topicOperator: {}
userOperator: {}
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.6.1
metadataVersion: 3.6-IV2
# The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
replicas: 3
version: 3.7.0
metadataVersion: 3.7-IV4
listeners:
- name: plain
port: 9092
Expand All @@ -47,22 +44,6 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
# The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
storage:
type: jbod
volumes:
- id: 0
type: persistent-claim
size: 100Gi
deleteClaim: false
# The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
# But it will be ignored when running in KRaft mode
zookeeper:
replicas: 3
storage:
type: persistent-claim
size: 100Gi
deleteClaim: false
entityOperator:
topicOperator: {}
userOperator: {}
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,8 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.6.1
metadataVersion: 3.6-IV2
# The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
replicas: 3
version: 3.7.0
metadataVersion: 3.7-IV4
listeners:
- name: plain
port: 9092
Expand All @@ -65,22 +62,6 @@ spec:
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
# The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
# But it will be ignored when Kafka Node Pools are used
storage:
type: jbod
volumes:
- id: 0
type: persistent-claim
size: 100Gi
deleteClaim: false
# The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
# But it will be ignored when running in KRaft mode
zookeeper:
replicas: 3
storage:
type: persistent-claim
size: 100Gi
deleteClaim: false
entityOperator:
topicOperator: {}
userOperator: {}
Loading

0 comments on commit 1b5ce12

Please sign in to comment.