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.

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

Add Strimzi 0.42.0 to the main branch #10323

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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="f029e1dd81b5391a8684a6f555a48f7bef12033e -"
HELM_CHART_CHECKSUM="6c32d691be37e95c68638288275ad47b5a275d8e -"

### 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="14e11d5c21ef74c34ddd1ea72e1d94d8265a2ff1 -"
INSTALL_CHECKSUM="dc760e2f067bb7eb2ef769b8d9a81c20f0e64ad7 -"

### 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="73840e1a54d89ad2135ba0ff24af7a29dd5c4822 -"
EXAMPLES_CHECKSUM="22ff8d529ae76aad35d7437eaf1bbd58d5451f12 -"
8 changes: 4 additions & 4 deletions examples/connect/kafka-connect-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
# # needing to call the Connect REST API directly
# strimzi.io/use-connector-resources: "true"
spec:
version: 3.7.0
version: 3.7.1
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
trustedCertificates:
- secretName: my-cluster-cluster-ca-cert
certificate: ca.crt
pattern: "*.crt"
config:
group.id: connect-cluster
offset.storage.topic: connect-cluster-offsets
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.7.0:24h
image: ttl.sh/strimzi-connect-example-3.7.1:24h
plugins:
- name: kafka-connect-file
artifacts:
- type: maven
group: org.apache.kafka
artifact: connect-file
version: 3.7.0
version: 3.7.1
4 changes: 2 additions & 2 deletions examples/connect/kafka-connect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
# # needing to call the Connect REST API directly
# strimzi.io/use-connector-resources: "true"
spec:
version: 3.7.0
version: 3.7.1
replicas: 1
bootstrapServers: my-cluster-kafka-bootstrap:9093
tls:
trustedCertificates:
- secretName: my-cluster-cluster-ca-cert
certificate: ca.crt
pattern: "*.crt"
config:
group.id: connect-cluster
offset.storage.topic: connect-cluster-offsets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: my-cluster
spec:
kafka:
version: 3.7.0
version: 3.7.1
replicas: 3
listeners:
- name: plain
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.7.0
version: 3.7.1
replicas: 3
listeners:
- name: plain
Expand Down
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.7.0
version: 3.7.1
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.7.0
version: 3.7.1
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.7.0
version: 3.7.1
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.7.0
version: 3.7.1
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.7.0
version: 3.7.1
replicas: 3
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka/kafka-with-node-pools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ metadata:
strimzi.io/node-pools: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
listeners:
- name: plain
port: 9092
Expand Down
1 change: 0 additions & 1 deletion examples/kafka/kraft/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ The examples in this directory demonstrate how you can use Kraft (ZooKeeper-less
* 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.
* The [`kafka-single-node.yaml`](kafka-single-node.yaml) deploys a Kafka cluster with a single Kafka node that has both _broker_ and _controller_ roles.

To use KRaft, ensure that the `UseKRaft` feature gate is not disabled.
Please note that ZooKeeper-less Apache Kafka is still under development and has some limitations.
For instance, scaling of controller node or JBOD storage (you can specify `type: jbod` storage in Strimzi custom resources, but it should contain only a single volume) are not supported.
2 changes: 1 addition & 1 deletion examples/kafka/kraft/kafka-ephemeral.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
metadataVersion: 3.7-IV4
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka/kraft/kafka-jbod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
metadataVersion: 3.7-IV4
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka/kraft/kafka-single-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
metadataVersion: 3.7-IV4
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka/kraft/kafka-with-dual-role-nodes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
metadataVersion: 3.7-IV4
listeners:
- name: plain
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka/kraft/kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ metadata:
strimzi.io/kraft: enabled
spec:
kafka:
version: 3.7.0
version: 3.7.1
metadataVersion: 3.7-IV4
listeners:
- name: plain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@
"targets": [
{
"datasource": "${DS_PROMETHEUS}",
"expr": "sum(jvm_memory_bytes_used{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-cruise-control-.*\",strimzi_io_name=\"$strimzi_cluster_name-cruise-control\"}) by (kubernetes_pod_name)",
"expr": "sum(jvm_memory_used_bytes{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-cruise-control-.*\",strimzi_io_name=\"$strimzi_cluster_name-cruise-control\"}) by (kubernetes_pod_name)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{kubernetes_pod_name}}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@
"targets": [
{
"datasource": "${DS_PROMETHEUS}",
"expr": "sum (jvm_memory_bytes_used{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"}) by (kubernetes_pod_name)",
"expr": "sum (jvm_memory_used_bytes{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"}) by (kubernetes_pod_name)",
"format": "time_series",
"hide": false,
"intervalFactor": 2,
Expand Down
Loading
Loading