Skip to content

Commit

Permalink
Prepare for 0.23.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 May 12, 2021
1 parent b264a4d commit 5315369
Show file tree
Hide file tree
Showing 34 changed files with 209 additions and 167 deletions.
2 changes: 1 addition & 1 deletion api-conversion/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.23.0-RC1</version>
<version>0.23.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.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.23.0-RC1</version>
<version>0.23.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions documentation/shared/attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
:KubernetesVersion: 1.16 and later

// Kafka upgrade attributes used in kafka upgrades section
:DefaultKafkaVersion: 2.7.0
:KafkaVersionLower: 2.6.1
:KafkaVersionHigher: 2.7.0
:DefaultKafkaVersion: 2.8.0
:KafkaVersionLower: 2.7.0
:KafkaVersionHigher: 2.8.0
:ExampleImageTagUpgrades: quay.io/strimzi/kafka:{ProductVersion}-kafka-{KafkaVersionHigher}

//log message format version and inter-broker protocol version
:LogMsgVersLower: 2.6
:LogMsgVersHigher: 2.7
:InterBrokVersLower: 2.6
:InterBrokVersHigher: 2.7
:LogMsgVersLower: 2.7
:LogMsgVersHigher: 2.8
:InterBrokVersLower: 2.7
:InterBrokVersHigher: 2.8

// Source and download links
:ReleaseDownload: https://github.com/strimzi/strimzi-kafka-operator/releases[GitHub^]
Expand Down
48 changes: 31 additions & 17 deletions helm-charts/helm3/strimzi-kafka-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Strimzi: Kafka as a Service
# Strimzi: Apache Kafka on Kubernetes

Strimzi provides a way to run an [Apache Kafka®](https://kafka.apache.org) cluster on
[Kubernetes](https://kubernetes.io/) or [OpenShift](https://www.openshift.com/) in various deployment configurations.
See our [website](https://strimzi.io) for more details about the project.

## CRD Upgrades

**!!! IMPORTANT !!!**
Strimzi 0.23 and newer supports only the API version `v1beta2` of all Strimzi custom resources.
This is a required as part of the migration to `apiextensionsk8s.io/v1` which is needed because Kubernetes 1.22 will remove support for `apiextensions.k8s.io/v1beta1`.
Migration to `v1beta2` needs to be completed for all Strimzi CRDs and CRs before the upgrade to 0.23 or newer.
For more details about the CRD upgrades, see the [documentation](https://strimzi.io/docs/operators/0.22.1/deploying.html#assembly-upgrade-resources-str).

## Introduction

This chart bootstraps the Strimzi Cluster Operator Deployment, Cluster Roles, Cluster Role Bindings, Service Accounts, and
Expand All @@ -17,12 +25,18 @@ cluster using the [Helm](https://helm.sh) package manager.
* **Topic Management** - Creates and manages Kafka Topics within the cluster.
* **User Management** - Creates and manages Kafka Users within the cluster.
* **Connector Management** - Creates and manages Kafka Connect connectors.
* **Includes Kafka Mirror Maker** - Allows for mirroring data between different Apache Kafka® clusters.
* **Includes Kafka Mirror Maker 1 and 2** - Allows for mirroring data between different Apache Kafka® clusters.
* **Includes HTTP Kafka Bridge** - Allows clients to send and receive messages through an Apache Kafka® cluster via the HTTP protocol.
* **Includes Cruise Control** - Automates the process of balancing partitions across an Apache Kafka® cluster.
* **Prometheus monitoring** - Built-in support for monitoring using Prometheus.

### Upgrading your Clusters

To upgrade the Strimzi operator, you can use the `helm upgrade` command.
The `helm upgrade` command does not upgrade the [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/).
Install the new CRDs manually after upgrading the Cluster Operator.
You can access the CRDs from our [GitHub release page](https://github.com/strimzi/strimzi-kafka-operator/releases) or find them in the `crd` subdirectory inside the Helm Chart.

The Strimzi Operator understands how to run and upgrade between a set of Kafka versions.
When specifying a new version in your config, check to make sure you aren't using any features that may have been removed.
See [the upgrade guide](https://strimzi.io/docs/latest/#assembly-upgrading-kafka-versions-str) for more information.
Expand All @@ -43,7 +57,7 @@ Strimzi is licensed under the [Apache License, Version 2.0](https://github.com/s

## Prerequisites

- Kubernetes 1.11+
- Kubernetes 1.16+

## Installing the Chart

Expand Down Expand Up @@ -84,7 +98,7 @@ the documentation for more details.
| `image.registry` | Cluster Operator image registry | `quay.io` |
| `image.repository` | Cluster Operator image repository | `strimzi` |
| `image.name` | Cluster Operator image name | `cluster-operator` |
| `image.tag` | Cluster Operator image tag | `0.23.0-rc1` |
| `image.tag` | Cluster Operator image tag | `0.23.0` |
| `image.imagePullPolicy` | Image pull policy for all pods deployed by Cluster Operator | `IfNotPresent` |
| `image.imagePullSecrets` | Docker registry pull secret | `nil` |
| `fullReconciliationIntervalMs` | Full reconciliation interval in milliseconds | 120000 |
Expand All @@ -93,59 +107,59 @@ the documentation for more details.
| `zookeeper.image.registry ` | ZooKeeper image registry | `quay.io` |
| `zookeeper.image.repository` | ZooKeeper image repository | `strimzi` |
| `zookeeper.image.name` | ZooKeeper image name | `kafka` |
| `zookeeper.image.tag` | ZooKeeper image tag prefix | `0.23.0-rc1` |
| `zookeeper.image.tag` | ZooKeeper image tag prefix | `0.23.0` |
| `jmxtrans.image.registry` | JmxTrans image registry | `quay.io` |
| `jmxtrans.image.repository` | JmxTrans image repository | `strimzi` |
| `jmxtrans.image.name` | JmxTrans image name | `jmxtrans` |
| `jmxtrans.image.tag` | JmxTrans image tag prefix | `0.23.0-rc1` |
| `jmxtrans.image.tag` | JmxTrans image tag prefix | `0.23.0` |
| `kafka.image.registry` | Kafka image registry | `quay.io` |
| `kafka.image.repository` | Kafka image repository | `strimzi` |
| `kafka.image.name` | Kafka image name | `kafka` |
| `kafka.image.tagPrefix` | Kafka image tag prefix | `0.23.0-rc1` |
| `kafka.image.tagPrefix` | Kafka image tag prefix | `0.23.0` |
| `kafkaConnect.image.registry` | Kafka Connect image registry | `quay.io` |
| `kafkaConnect.image.repository` | Kafka Connect image repository | `strimzi` |
| `kafkaConnect.image.name` | Kafka Connect image name | `kafka` |
| `kafkaConnect.image.tagPrefix` | Kafka Connect image tag prefix | `0.23.0-rc1` |
| `kafkaConnect.image.tagPrefix` | Kafka Connect image tag prefix | `0.23.0` |
| `kafkaConnects2i.image.registry` | Kafka Connect s2i image registry | `quay.io` |
| `kafkaConnects2i.image.repository` | Kafka Connect s2i image repository | `strimzi` |
| `kafkaConnects2i.image.name` | Kafka Connect s2i image name | `kafka` |
| `kafkaConnects2i.image.tagPrefix` | Kafka Connect s2i image tag prefix | `0.23.0-rc1` |
| `kafkaConnects2i.image.tagPrefix` | Kafka Connect s2i image tag prefix | `0.23.0` |
| `kafkaMirrorMaker.image.registry` | Kafka Mirror Maker image registry | `quay.io` |
| `kafkaMirrorMaker.image.repository` | Kafka Mirror Maker image repository | `strimzi` |
| `kafkaMirrorMaker.image.name` | Kafka Mirror Maker image name | `kafka` |
| `kafkaMirrorMaker.image.tagPrefix` | Kafka Mirror Maker image tag prefix | `0.23.0-rc1` |
| `kafkaMirrorMaker.image.tagPrefix` | Kafka Mirror Maker image tag prefix | `0.23.0` |
| `cruiseControl.image.registry` | Cruise Control image registry | `quay.io` |
| `cruiseControl.image.repository` | Cruise Control image repository | `strimzi` |
| `cruiseControl.image.name` | Cruise Control image name | `kafka` |
| `cruiseControl.image.tag` | Cruise Control image tag prefix | `0.23.0-rc1` |
| `cruiseControl.image.tag` | Cruise Control image tag prefix | `0.23.0` |
| `topicOperator.image.registry` | Topic Operator image registry | `quay.io` |
| `topicOperator.image.repository` | Topic Operator image repository | `strimzi` |
| `topicOperator.image.name` | Topic Operator image name | `operator` |
| `topicOperator.image.tag` | Topic Operator image tag | `0.23.0-rc1` |
| `topicOperator.image.tag` | Topic Operator image tag | `0.23.0` |
| `userOperator.image.registry` | User Operator image registry | `quay.io` |
| `userOperator.image.repository` | User Operator image repository | `strimzi` |
| `userOperator.image.name` | User Operator image name | `operator` |
| `userOperator.image.tag` | User Operator image tag | `0.23.0-rc1` |
| `userOperator.image.tag` | User Operator image tag | `0.23.0` |
| `kafkaInit.image.registry` | Init Kafka image registry | `quay.io` |
| `kafkaInit.image.repository` | Init Kafka image repository | `strimzi` |
| `kafkaInit.image.name` | Init Kafka image name | `operator` |
| `kafkaInit.image.tag` | Init Kafka image tag | `0.23.0-rc1` |
| `kafkaInit.image.tag` | Init Kafka image tag | `0.23.0` |
| `tlsSidecarCruiseControl.image.registry` | TLS Sidecar for Cruise Control image registry | `quay.io` |
| `tlsSidecarCruiseControl.image.repository` | TLS Sidecar for Cruise Control image repository | `strimzi` |
| `tlsSidecarCruiseControl.image.name` | TLS Sidecar for Cruise Control image name | `kafka` |
| `tlsSidecarCruiseControl.image.tag` | TLS Sidecar for Cruise Control image tag prefix | `0.23.0-rc1` |
| `tlsSidecarCruiseControl.image.tag` | TLS Sidecar for Cruise Control image tag prefix | `0.23.0` |
| `tlsSidecarTopicOperator.image.registry` | TLS Sidecar for Topic Operator image registry | `quay.io` |
| `tlsSidecarTopicOperator.image.repository` | TLS Sidecar for Topic Operator image repository | `strimzi` |
| `tlsSidecarTopicOperator.image.name` | TLS Sidecar for Topic Operator image name | `kafka` |
| `tlsSidecarTopicOperator.image.tag` | TLS Sidecar for Topic Operator image tag prefix | `0.23.0-rc1` |
| `tlsSidecarTopicOperator.image.tag` | TLS Sidecar for Topic Operator image tag prefix | `0.23.0` |
| `kafkaBridge.image.registry` | Kafka Bridge image registry | `quay.io` |
| `kafkaBridge.image.repository` | Kafka Bridge image repository | `strimzi` |
| `kafkaBridge.image.name` | Kafka Bridge image name | `kafka-bridge |
| `kafkaBridge.image.tag` | Kafka Bridge image tag | `0.19.0` |
| `kanikoExecutor.image.registry` | Kaniko Executor image registry | `quay.io` |
| `kanikoExecutor.image.repository` | Kaniko Executor image repository | `strimzi` |
| `kanikoExecutor.image.name` | Kaniko Executor image name | `kaniko-executor` |
| `kanikoExecutor.image.tag` | Kaniko Executor image tag | `0.23.0-rc1` |
| `kanikoExecutor.image.tag` | Kaniko Executor image tag | `0.23.0` |
| `resources.limits.memory` | Memory constraint for limits | `256Mi` |
| `resources.limits.cpu` | CPU constraint for limits | `1000m` |
| `resources.requests.memory` | Memory constraint for requests | `256Mi` |
Expand Down
32 changes: 16 additions & 16 deletions helm-charts/helm3/strimzi-kafka-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ image:
registry: quay.io
repository: strimzi
name: operator
tag: 0.23.0-rc1
tag: 0.23.0
logVolume: co-config-volume
logConfigMap: strimzi-cluster-operator
logLevel: ${env:STRIMZI_LOG_LEVEL:-INFO}
Expand All @@ -32,55 +32,55 @@ zookeeper:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kafka:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kafkaConnect:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kafkaConnects2i:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
topicOperator:
image:
registry: quay.io
repository: strimzi
name: operator
tag: 0.23.0-rc1
tag: 0.23.0
userOperator:
image:
registry: quay.io
repository: strimzi
name: operator
tag: 0.23.0-rc1
tag: 0.23.0
kafkaInit:
image:
registry: quay.io
repository: strimzi
name: operator
tag: 0.23.0-rc1
tag: 0.23.0
tlsSidecarEntityOperator:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kafkaMirrorMaker:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kafkaBridge:
image:
registry: quay.io
Expand All @@ -92,37 +92,37 @@ kafkaExporter:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
jmxTrans:
image:
registry: quay.io
repository: strimzi
name: jmxtrans
tag: 0.23.0-rc1
tag: 0.23.0
kafkaMirrorMaker2:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
cruiseControl:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
tlsSidecarCruiseControl:
image:
registry: quay.io
repository: strimzi
name: kafka
tagPrefix: 0.23.0-rc1
tagPrefix: 0.23.0
kanikoExecutor:
image:
registry: quay.io
repository: strimzi
name: kaniko-executor
tag: 0.23.0-rc1
tag: 0.23.0
resources:
limits:
memory: 384Mi
Expand Down
Loading

0 comments on commit 5315369

Please sign in to comment.