Skip to content

Commit

Permalink
Prepare for 0.29.0
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Scholz <www@scholzj.com>
  • Loading branch information
scholzj committed May 13, 2022
1 parent 24a0b54 commit 1254913
Show file tree
Hide file tree
Showing 93 changed files with 3,003 additions and 4,225 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="1b849c733d16236b0fe8b9fd8dfec036f2eb5ffd -"
HELM_CHART_CHECKSUM="8f91663fcf9ef6547447935b87c15507e3f79e61 -"

### 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="bf8702e013e395e058995517a422dbf2acd47fb4 -"
INSTALL_CHECKSUM="21c80eb3697d0668d9e4a3da45fe83f0c9ffb692 -"

### 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="d4862b639539f19403a79b3fd31058be182a9cc8 -"
EXAMPLES_CHECKSUM="5a9c3865b7ef2ddd69128435fbfaf5a3ec0f5ef7 -"
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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.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.29.0-SNAPSHOT</version>
<version>0.29.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions documentation/shared/attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
:KubernetesVersion: 1.16 and later

// Kafka upgrade attributes used in kafka upgrades section
:DefaultKafkaVersion: 3.1.0
:KafkaVersionLower: 3.0.0
:KafkaVersionHigher: 3.1.0
:DefaultKafkaVersion: 3.2.0
:KafkaVersionLower: 3.1.0
:KafkaVersionHigher: 3.2.0
:ExampleImageTagUpgrades: quay.io/strimzi/kafka:{ProductVersion}-kafka-{KafkaVersionHigher}

//inter-broker protocol and log message version
:DefaultInterBrokerVersion: 3.1
:InterBrokerVersionLower: 3.0
:InterBrokerVersionHigher: 3.1
:DefaultInterBrokerVersion: 3.2
:InterBrokerVersionLower: 3.1
:InterBrokerVersionHigher: 3.2

// Source and download links
:ReleaseDownload: https://github.com/strimzi/strimzi-kafka-operator/releases[GitHub releases page^]
Expand Down
43 changes: 43 additions & 0 deletions examples/connect/kafka-connect-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
apiVersion: kafka.strimzi.io/v1beta2
kind: KafkaConnect
metadata:
name: my-connect-cluster
# annotations:
# # use-connector-resources configures this KafkaConnect
# # to use KafkaConnector resources to avoid
# # needing to call the Connect REST API directly
# strimzi.io/use-connector-resources: "true"
spec:
version: 3.1.0
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
trustedCertificates:
- secretName: my-cluster-cluster-ca-cert
certificate: ca.crt
config:
group.id: connect-cluster
offset.storage.topic: connect-cluster-offsets
config.storage.topic: connect-cluster-configs
status.storage.topic: connect-cluster-status
# -1 means it will use the default replication factor configured in the broker
config.storage.replication.factor: -1
offset.storage.replication.factor: -1
status.storage.replication.factor: -1
build:
output:
type: docker
# This image will last only for 24 hours and might be overwritten by other users
# Strimzi will use this tag to push the image. But it will use the digest to pull
# the container image to make sure it pulls exactly the image we just built. So
# 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.1.0:24h
plugins:
- name: kafka-connect-file
artifacts:
- type: maven
group: org.apache.kafka
artifact: connect-file
version: 3.1.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.1.0
version: 3.2.0
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
Expand Down
4 changes: 4 additions & 0 deletions examples/connect/source-connector.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# To use the KafkaConnector resource, you have to first enable the connector operator using
# the strimzi.io/use-connector-resources annotation on the KafkaConnect custom resource.
# From Apache Kafka 3.1.1 and 3.2.0, you also have to add the FileStreamSourceConnector
# connector to the container image. You can do that using the kafka-connect-build.yaml example.
apiVersion: kafka.strimzi.io/v1beta2
kind: KafkaConnector
metadata:
Expand Down
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 3
listeners:
- name: plain
Expand Down
10 changes: 10 additions & 0 deletions examples/cruise-control/kafka-rebalance-add-brokers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: kafka.strimzi.io/v1beta2
kind: KafkaRebalance
metadata:
name: my-rebalance
labels:
strimzi.io/cluster: my-cluster
# no goals specified, using the default goals from the Cruise Control configuration
spec:
mode: add-broker
brokers: [3, 4]
10 changes: 10 additions & 0 deletions examples/cruise-control/kafka-rebalance-remove-brokers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: kafka.strimzi.io/v1beta2
kind: KafkaRebalance
metadata:
name: my-rebalance
labels:
strimzi.io/cluster: my-cluster
# no goals specified, using the default goals from the Cruise Control configuration
spec:
mode: remove-broker
brokers: [3, 4]
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 1
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 3
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 3
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 1
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion 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.1.0
version: 3.2.0
replicas: 3
listeners:
- name: plain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,12 @@
"interval": "",
"legendFormat": "#producer connections",
"refId": "B"
},
{
"expr": "sum(kafka_admin_client_connection_count{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"})",
"legendFormat": "#admin connections",
"interval": "",
"refId": "C"
}
],
"thresholds": [],
Expand Down
Loading

0 comments on commit 1254913

Please sign in to comment.