Skip to content

Commit

Permalink
Prepare for 0.26.1
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Scholz <www@scholzj.com>
  • Loading branch information
scholzj committed Dec 13, 2021
1 parent b7589c1 commit 20cfdcc
Show file tree
Hide file tree
Showing 44 changed files with 136 additions and 102 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="4d0330a8ea4fe55d2afb3207afcad251c04b29e4 -"
HELM_CHART_CHECKSUM="3681f0de5a6d1c09e31254f17dc607b94c0d493f -"

### 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="9cbc83ca420b34e5f5fdfe2780524b87d40e0b27 -"
INSTALL_CHECKSUM="2abbbfacdf240cfb2e7b836408571c34a2214af8 -"

### 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="f0c41063b4e67d06bdd45d0a9e90c9b416cc1b30 -"
EXAMPLES_CHECKSUM="a4acfb83818079948dfb09e9e6e1b36f06aa21f9 -"
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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</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.26.0</version>
<version>0.26.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crd-generator</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions documentation/modules/snip-images.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ a|
a|
Strimzi image for running the Strimzi kafka Bridge

|Strimzi Drain Cleaner
a|
* {DockerOrg}/drain-cleaner:{DrainCleanerDockerTag}
a|
Strimzi image for running the Strimzi Drain Cleaner

|JmxTrans
a|
* {DockerOrg}/jmxtrans:{DockerTag}
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 @@ -5,10 +5,10 @@ This folder contains an example `Kafka` custom resource configured for OAuth 2.0
- the corresponding `oauth` authentication
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.26.0/using.html#con-oauth-authorization-keycloak-example).
Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.26.1/using.html#con-oauth-authorization-keycloak-example).

* [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.26.0/using.html#con-oauth-authorization-keycloak-example) for proper preparation and deployment.
using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.26.1/using.html#con-oauth-authorization-keycloak-example) for proper preparation and deployment.
4 changes: 2 additions & 2 deletions helm-charts/helm3/strimzi-kafka-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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.26.0` |
| `defaultImageTag` | Default image tag for all the images except Kafka Bridge | `0.26.1` |
| `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 Down Expand Up @@ -157,7 +157,7 @@ the documentation for more details.
| `kafkaBridge.image.registry` | Override default Kafka Bridge image registry | `quay.io` |
| `kafkaBridge.image.repository` | Override default Kafka Bridge image repository | `strimzi` |
| `kafkaBridge.image.name` | Kafka Bridge image name | `kafka-bridge` |
| `kafkaBridge.image.tag` | Override default Kafka Bridge image tag | `0.20.3` |
| `kafkaBridge.image.tag` | Override default Kafka Bridge image tag | `0.21.0` |
| `kanikoExecutor.image.registry` | Override default Kaniko Executor image registry | `nil` |
| `kanikoExecutor.image.repository` | Override default Kaniko Executor image repository | `nil` |
| `kanikoExecutor.image.name` | Kaniko Executor image name | `kaniko-executor` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down Expand Up @@ -2418,7 +2418,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down Expand Up @@ -4383,7 +4383,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down Expand Up @@ -1582,7 +1582,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
pullSecret:
type: string
description: Container Registry Secret with the credentials for pulling the base image.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
maxUnavailable:
type: integer
minimum: 0
Expand Down Expand Up @@ -1676,7 +1676,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
description: Annotations added to the resource template. Can be applied to different resources such as `StatefulSets`, `Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate` resource.
description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
pullSecret:
type: string
description: Container Registry Secret with the credentials for pulling the base image.
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/helm3/strimzi-kafka-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ watchAnyNamespace: false

defaultImageRegistry: quay.io
defaultImageRepository: strimzi
defaultImageTag: 0.26.0
defaultImageTag: 0.26.1

image:
registry: ""
Expand Down Expand Up @@ -87,7 +87,7 @@ kafkaBridge:
registry: ""
repository:
name: kafka-bridge
tag: 0.20.3
tag: 0.21.0
kafkaExporter:
image:
registry: ""
Expand Down
6 changes: 3 additions & 3 deletions install/cluster-operator/040-Crd-kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down Expand Up @@ -3000,7 +3000,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down Expand Up @@ -5217,7 +5217,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down
4 changes: 2 additions & 2 deletions install/cluster-operator/041-Crd-kafkaconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down Expand Up @@ -1746,7 +1746,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
pullSecret:
type: string
Expand Down
2 changes: 1 addition & 1 deletion install/cluster-operator/045-Crd-kafkamirrormaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down
2 changes: 1 addition & 1 deletion install/cluster-operator/046-Crd-kafkabridge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down
4 changes: 2 additions & 2 deletions install/cluster-operator/048-Crd-kafkamirrormaker2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
maxUnavailable:
type: integer
Expand Down Expand Up @@ -1872,7 +1872,7 @@ spec:
description: Annotations added to the resource template.
Can be applied to different resources such as `StatefulSets`,
`Deployments`, `Pods`, and `Services`.
description: Metadata to apply to the `PodDistruptionBugetTemplate`
description: Metadata to apply to the `PodDisruptionBudgetTemplate`
resource.
pullSecret:
type: string
Expand Down
Loading

0 comments on commit 20cfdcc

Please sign in to comment.