Skip to content

Commit

Permalink
Prepare for Strimzi 0.34.0
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Scholz <[email protected]>
  • Loading branch information
scholzj committed Mar 15, 2023
1 parent 5a94a40 commit e17de25
Show file tree
Hide file tree
Showing 88 changed files with 932 additions and 535 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="9c360dbc87edc9f202f4a474ea054a8d381800e7 -"
HELM_CHART_CHECKSUM="13e73bf2a1d62c49f5a0de796e4d2f8017eead71 -"

### 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="a69e0450f7de8e5af0710e3d2ac9ad78d97cf0e3 -"
INSTALL_CHECKSUM="df8e4258ed54685af342c95cfa443259713eedde -"

### 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="65ddcbf2f091cc451f1e11473a42f69fcd40d8fd -"
EXAMPLES_CHECKSUM="c2b690e654f2c65905e01720c19105ed75d46709 -"
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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.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.34.0-SNAPSHOT</version>
<version>0.34.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
63 changes: 63 additions & 0 deletions examples/cruise-control/kafka-cruise-control-with-goals.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
apiVersion: kafka.strimzi.io/v1beta2
kind: Kafka
metadata:
name: my-cluster
spec:
kafka:
version: 3.4.0
replicas: 3
listeners:
- name: plain
port: 9092
type: internal
tls: false
- name: tls
port: 9093
type: internal
tls: true
config:
offsets.topic.replication.factor: 3
transaction.state.log.replication.factor: 3
transaction.state.log.min.isr: 2
default.replication.factor: 3
min.insync.replicas: 2
inter.broker.protocol.version: "3.4"
storage:
type: ephemeral
zookeeper:
replicas: 3
storage:
type: ephemeral
entityOperator:
topicOperator: {}
userOperator: {}
cruiseControl:
config:
# Note that `goals` must be a superset of `default.goals` and `hard.goals`
goals: >
com.linkedin.kafka.cruisecontrol.analyzer.goals.RackAwareGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.MinTopicLeadersPerBrokerGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.ReplicaCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.DiskCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.NetworkInboundCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.NetworkOutboundCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.CpuCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.ReplicaDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.PotentialNwOutGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.DiskUsageDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.NetworkInboundUsageDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.NetworkOutboundUsageDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.CpuUsageDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.TopicReplicaDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.LeaderReplicaDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.LeaderBytesInDistributionGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.PreferredLeaderElectionGoal
# Note that `default.goals` must be a superset `hard.goals`
default.goals: >
com.linkedin.kafka.cruisecontrol.analyzer.goals.RackAwareGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.ReplicaCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.DiskCapacityGoal
hard.goals: >
com.linkedin.kafka.cruisecontrol.analyzer.goals.RackAwareGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.ReplicaCapacityGoal,
com.linkedin.kafka.cruisecontrol.analyzer.goals.DiskCapacityGoal
21 changes: 21 additions & 0 deletions examples/metrics/kafka-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,27 @@ data:
type: GAUGE
labels:
quantile: "0.$4"
# KRaft mode: uncomment the following lines to export KRaft related metrics
# KRaft overall related metrics
# distinguish between always increasing COUNTER (total and max) and variable GAUGE (all others) metrics
#- pattern: "kafka.server<type=raft-metrics><>(.+-total|.+-max):"
# name: kafka_server_raftmetrics_$1
# type: COUNTER
#- pattern: "kafka.server<type=raft-metrics><>(.+):"
# name: kafka_server_raftmetrics_$1
# type: GAUGE
# KRaft "low level" channels related metrics
# distinguish between always increasing COUNTER (total and max) and variable GAUGE (all others) metrics
#- pattern: "kafka.server<type=raft-channel-metrics><>(.+-total|.+-max):"
# name: kafka_server_raftchannelmetrics_$1
# type: COUNTER
#- pattern: "kafka.server<type=raft-channel-metrics><>(.+):"
# name: kafka_server_raftchannelmetrics_$1
# type: GAUGE
# Broker metrics related to fetching metadata topic records in KRaft mode
#- pattern: "kafka.server<type=broker-metadata-metrics><>(.+):"
# name: kafka_server_brokermetadatametrics_$1
# type: GAUGE
zookeeper-metrics-config.yml: |
# See https://github.com/prometheus/jmx_exporter for more info about JMX Prometheus Exporter metrics
lowercaseOutputName: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ spec:
replication.factor: 1
offset-syncs.topic.replication.factor: 1
sync.topic.acls.enabled: "false"
replication.policy.separator: ""
replication.policy.class: "org.apache.kafka.connect.mirror.IdentityReplicationPolicy"
heartbeatConnector:
config:
heartbeats.topic.replication.factor: 1
checkpointConnector:
config:
checkpoints.topic.replication.factor: 1
replication.policy.separator: ""
replication.policy.class: "org.apache.kafka.connect.mirror.IdentityReplicationPolicy"
topicsPattern: ".*"
groupsPattern: ".*"
4 changes: 2 additions & 2 deletions examples/security/keycloak-authorization/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ This folder contains an example `Kafka` custom resource configured for OAuth 2.0

The folder also contains a Keycloak realm export to import into your Keycloak instance to support the example.

Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.33.2/configuring.html#proc-oauth-authorization-keycloak-example_str).
Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.34.0/configuring.html#proc-oauth-authorization-keycloak-example_str).

- [kafka-authz-realm.json](./kafka-authz-realm.json)
- The Keycloak realm export file
- [kafka-ephemeral-oauth-single-keycloak-authz.yaml](./kafka-ephemeral-oauth-single-keycloak-authz.yaml)
- The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.33.2/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.34.0/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
- [kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml](./kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml)
- The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
with included configuration for exporting the OAuth metrics using Prometheus JMX exporter.
Expand Down
Loading

0 comments on commit e17de25

Please sign in to comment.