Skip to content

Commit

Permalink
Prepare for 0.37.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 Sep 1, 2023
1 parent 27d13b7 commit 08bf622
Show file tree
Hide file tree
Showing 47 changed files with 182 additions and 96 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="966b383924a7e3e98e7061de725475cff9536158 -"
HELM_CHART_CHECKSUM="97fb3a0963c14c9260609df5235ef605501ae287 -"

### 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="55255d401d8ee615ce3b36bdbad8ae245409242c -"
INSTALL_CHECKSUM="39090d3578928f88d8c0c0f89329323c1e92856e -"

### 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="0d579431b3f87e44ab8693d7c2430b70408c4b52 -"
EXAMPLES_CHECKSUM="f441ffc80fa661449dd9589201124f8ad4f95321 -"
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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.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.37.0-SNAPSHOT</version>
<version>0.37.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
23 changes: 22 additions & 1 deletion examples/metrics/grafana-dashboards/strimzi-kafka.json
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-kafka-[0-9]+\"}) by (persistentvolumeclaim)",
"expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\"}) by (persistentvolumeclaim)",
"format": "time_series",
"hide": false,
"intervalFactor": 1,
Expand Down Expand Up @@ -2973,6 +2973,27 @@
"type": "query",
"useTags": false
},
{
"current": {},
"datasource": "${DS_PROMETHEUS}",
"definition": "",
"hide": 2,
"includeAll": true,
"label": "Pool name",
"multi": true,
"name": "pool_name",
"options": [],
"query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\"})",
"refresh": 1,
"regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
"skipUrlSync": false,
"sort": 3,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": ".*",
"current": {},
Expand Down
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.36.1/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.37.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.36.1/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.37.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
3 changes: 2 additions & 1 deletion helm-charts/helm3/strimzi-kafka-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ the documentation for more details.
| `watchAnyNamespace` | Watch the whole Kubernetes cluster (all namespaces) | `false` |
| `defaultImageRegistry` | Default image registry for all the images | `quay.io` |
| `defaultImageRepository` | Default image registry for all the images | `strimzi` |
| `defaultImageTag` | Default image tag for all the images except Kafka Bridge | `0.36.1` |
| `defaultImageTag` | Default image tag for all the images except Kafka Bridge | `0.37.0` |
| `image.registry` | Override default Cluster Operator image registry | `nil` |
| `image.repository` | Override default Cluster Operator image repository | `nil` |
| `image.name` | Cluster Operator image name | `cluster-operator` |
Expand All @@ -104,6 +104,7 @@ the documentation for more details.
| `image.imagePullPolicy` | Image pull policy for all pods deployed by Cluster Operator | `IfNotPresent` |
| `image.imagePullSecrets` | List of Docker registry pull secrets | `[]` |
| `fullReconciliationIntervalMs` | Full reconciliation interval in milliseconds | 120000 |
| `leaderElection.enable` | Whether to enable leader election | `true` |
| `operationTimeoutMs` | Operation timeout in milliseconds | 300000 |
| `operatorNamespaceLabels` | Labels of the namespace where the operator runs | `nil` |
| `podSecurityContext` | Cluster Operator pod's security context | `nil` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ spec:
config:
x-kubernetes-preserve-unknown-fields: true
type: object
description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers,node.id, process.roles, controller. (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size,ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation,cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms,cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms,cruise.control.metrics.topic.min.insync.replicas,controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers,node.id, process.roles, controller., metadata.log.dir (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size,ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation,cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms,cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms,cruise.control.metrics.topic.min.insync.replicas,controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
storage:
type: object
properties:
Expand Down Expand Up @@ -6306,4 +6306,10 @@ spec:
clusterId:
type: string
description: Kafka cluster Id.
operatorLastSuccessfulVersion:
type: string
description: The version of the Strimzi Cluster Operator which performed the last successful reconciliation.
kafkaVersion:
type: string
description: The version of Kafka currently deployed in the cluster.
description: "The status of the Kafka and ZooKeeper clusters, and Topic Operator."
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ spec:
enum:
- jaeger
- opentelemetry
description: Type of the tracing used. Currently the only supported types are `jaeger` for OpenTracing (Jaeger) tracing and `opentelemetry` for OpenTelemetry tracing. The OpenTracing (Jaeger) tracing is deprecated.
description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored."
required:
- type
description: The configuration of tracing in Kafka Connect.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ spec:
enum:
- jaeger
- opentelemetry
description: Type of the tracing used. Currently the only supported types are `jaeger` for OpenTracing (Jaeger) tracing and `opentelemetry` for OpenTelemetry tracing. The OpenTracing (Jaeger) tracing is deprecated.
description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored."
required:
- type
description: The configuration of tracing in Kafka MirrorMaker.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ spec:
enum:
- jaeger
- opentelemetry
description: Type of the tracing used. Currently the only supported types are `jaeger` for OpenTracing (Jaeger) tracing and `opentelemetry` for OpenTelemetry tracing. The OpenTracing (Jaeger) tracing is deprecated.
description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored."
required:
- type
description: The configuration of tracing in Kafka Bridge.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ spec:
enabled:
type: boolean
description: Whether automatic restart for failed connectors and tasks should be enabled or disabled.
maxRestarts:
type: integer
description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts."
description: Automatic restart of connector and tasks configuration.
config:
x-kubernetes-preserve-unknown-fields: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@ spec:
enabled:
type: boolean
description: Whether automatic restart for failed connectors and tasks should be enabled or disabled.
maxRestarts:
type: integer
description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts."
description: Automatic restart of connector and tasks configuration.
pause:
type: boolean
Expand All @@ -285,6 +288,9 @@ spec:
enabled:
type: boolean
description: Whether automatic restart for failed connectors and tasks should be enabled or disabled.
maxRestarts:
type: integer
description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts."
description: Automatic restart of connector and tasks configuration.
pause:
type: boolean
Expand All @@ -307,6 +313,9 @@ spec:
enabled:
type: boolean
description: Whether automatic restart for failed connectors and tasks should be enabled or disabled.
maxRestarts:
type: integer
description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts."
description: Automatic restart of connector and tasks configuration.
pause:
type: boolean
Expand Down Expand Up @@ -496,7 +505,7 @@ spec:
enum:
- jaeger
- opentelemetry
description: Type of the tracing used. Currently the only supported types are `jaeger` for OpenTracing (Jaeger) tracing and `opentelemetry` for OpenTelemetry tracing. The OpenTracing (Jaeger) tracing is deprecated.
description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored."
required:
- type
description: The configuration of tracing in Kafka Connect.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-kafka-[0-9]+\"}) by (persistentvolumeclaim)",
"expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\"}) by (persistentvolumeclaim)",
"format": "time_series",
"hide": false,
"intervalFactor": 1,
Expand Down Expand Up @@ -2973,6 +2973,27 @@
"type": "query",
"useTags": false
},
{
"current": {},
"datasource": "${DS_PROMETHEUS}",
"definition": "",
"hide": 2,
"includeAll": true,
"label": "Pool name",
"multi": true,
"name": "pool_name",
"options": [],
"query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\"})",
"refresh": 1,
"regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
"skipUrlSync": false,
"sort": 3,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": ".*",
"current": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ spec:
{{ toYaml .Values.extraEnvs | indent 12 }}
{{- end }}
- name: STRIMZI_LEADER_ELECTION_ENABLED
{{- if .Values.leaderElection.enable }}
value: "true"
{{- else }}
value: "false"
{{- end }}
- name: STRIMZI_LEADER_ELECTION_LEASE_NAME
value: "strimzi-cluster-operator"
- name: STRIMZI_LEADER_ELECTION_LEASE_NAMESPACE
Expand Down
5 changes: 4 additions & 1 deletion helm-charts/helm3/strimzi-kafka-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ watchAnyNamespace: false

defaultImageRegistry: quay.io
defaultImageRepository: strimzi
defaultImageTag: 0.36.1
defaultImageTag: 0.37.0

image:
registry: ""
Expand Down Expand Up @@ -50,6 +50,9 @@ rbac:
serviceAccountCreate: yes
serviceAccount: strimzi-cluster-operator

leaderElection:
enable: true

# If you are using the grafana dashboard sidecar,
# you can import some default dashboards here
dashboards:
Expand Down
Loading

0 comments on commit 08bf622

Please sign in to comment.