Prepare for next release candidate of 0.41.0

Signed-off-by: Jakub Scholz <www@scholzj.com>
strimzi · May 8, 2024 · c2d814d · c2d814d
1 parent 588c044
commit c2d814d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 28 deletions.
diff --git a/.checksums b/.checksums
@@ -6,15 +6,15 @@
 # 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="030bd62a0b2e8c20e461fb53cd36e9bf082dc45f  -"
+HELM_CHART_CHECKSUM="e58351b2cfc36c880ae103090f1df97dfed1451e  -"
 
 ### 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="74cb47a67fa26d784f21593467b2104b82e4185c  -"
+INSTALL_CHECKSUM="14e11d5c21ef74c34ddd1ea72e1d94d8265a2ff1  -"
 
 ### IMPORTANT ###
 # if the below line has changed, this means the ./examples directory has changed

diff --git a/helm-charts/helm3/strimzi-kafka-operator/README.md b/helm-charts/helm3/strimzi-kafka-operator/README.md
@@ -157,12 +157,6 @@ the documentation for more details.
 | `kafkaInit.image.name`                      | Init Kafka image name                                                           | `operator`                   |
 | `kafkaInit.image.tag`                       | Override default Init Kafka image tag                                           | `nil`                        |
 | `kafkaInit.image.digest`                    | Override Init Kafka image tag with digest                                       | `nil`                        |
-| `tlsSidecarEntityOperator.image.registry`   | Override default TLS Sidecar Entity Operator image registry                     | `nil`                        |
-| `tlsSidecarEntityOperator.image.repository` | Override default TLS Sidecar Entity Operator image repository                   | `nil`                        |
-| `tlsSidecarEntityOperator.image.name`       | TLS Sidecar Entity Operator image name                                          | `kafka`                      |
-| `tlsSidecarEntityOperator.image.tagPrefix`  | Override default TLS Sidecar Entity Operator image tag prefix                   | `nil`                        |
-| `tlsSidecarEntityOperator.image.tag`        | Override default TLS Sidecar Entity Operator image tag and ignore suffix        | `nil`                        |
-| `tlsSidecarEntityOperator.image.digest`     | Override TLS Sidecar Entity Operator image tag with digest                      | `nil`                        |
 | `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`               |

diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml
@@ -130,7 +130,7 @@ spec:
                             description: Indicates the resource for which given ACL rule applies.
                           host:
                             type: string
-                            description: The host from which the action described in the ACL rule is allowed or denied.
+                            description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                           operation:
                             type: string
                             enum:
@@ -361,7 +361,7 @@ spec:
                             description: Indicates the resource for which given ACL rule applies.
                           host:
                             type: string
-                            description: The host from which the action described in the ACL rule is allowed or denied.
+                            description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                           operation:
                             type: string
                             enum:
@@ -592,7 +592,7 @@ spec:
                             description: Indicates the resource for which given ACL rule applies.
                           host:
                             type: string
-                            description: The host from which the action described in the ACL rule is allowed or denied.
+                            description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                           operation:
                             type: string
                             enum:

diff --git a/helm-charts/helm3/strimzi-kafka-operator/templates/_helpers.tpl b/helm-charts/helm3/strimzi-kafka-operator/templates/_helpers.tpl
@@ -40,7 +40,7 @@ Creates the image name from the registry, repository, image, tag, and digest
 To use, add the following key/value pairs to the scope:
 - "key" [optional]: the key to lookup under .Values for the image map
 - "tagSuffix" [optional]: the suffix to add to tagPrefix or the default tag
-- Example: `template "strimzi.image" (merge . (dict "key" "tlsSidecarEntityOperator" "tagSuffix" "-kafka-3.1.0"))`
+- Example: `template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.1.0"))`
 */}}
 {{- define "strimzi.image" -}}
 {{- $vals := ternary .Values.image (index .Values .key).image (empty .key) -}}

diff --git a/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl
@@ -5,8 +5,6 @@
 
 {{/* Generate the kafka image map */}}
 {{- define "strimzi.kafka.image.map" }}
-            - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
-              value: {{ template "strimzi.image" (merge . (dict "key" "tlsSidecarEntityOperator" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
               value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE

diff --git a/helm-charts/helm3/strimzi-kafka-operator/values.yaml b/helm-charts/helm3/strimzi-kafka-operator/values.yaml
@@ -115,12 +115,6 @@ kafkaInit:
     repository: ""
     name: operator
     tag: ""
-tlsSidecarEntityOperator:
-  image:
-    registry: ""
-    repository: ""
-    name: kafka
-    tagPrefix: ""
 kafkaMirrorMaker:
   image:
     registry: ""

diff --git a/install/cluster-operator/044-Crd-kafkauser.yaml b/install/cluster-operator/044-Crd-kafkauser.yaml
@@ -129,7 +129,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum:
@@ -360,7 +360,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum:
@@ -591,7 +591,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum:

diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -47,8 +47,6 @@ spec:
               value: "120000"
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
-            - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
-              value: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
               value: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE

diff --git a/install/user-operator/04-Crd-kafkauser.yaml b/install/user-operator/04-Crd-kafkauser.yaml
@@ -129,7 +129,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum:
@@ -360,7 +360,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum:
@@ -591,7 +591,7 @@ spec:
                           description: Indicates the resource for which given ACL rule applies.
                         host:
                           type: string
-                          description: The host from which the action described in the ACL rule is allowed or denied.
+                          description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host."
                         operation:
                           type: string
                           enum: