feat: Conflicts resolves for 0.29.0 rebase

Contributes to: mhub/qp-planning#8065 Signed-off-by: Jonathan Hughes <jonathan.hughes@ibm.com>
strimzi · May 27, 2022 · 4413272 · 4413272
1 parent a816fdf
commit 4413272
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/packaging/examples/security/keycloak-authorization/README.md b/packaging/examples/security/keycloak-authorization/README.md
@@ -5,7 +5,11 @@ 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.
 
+<<<<<<< HEAD
 Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.29.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.28.0/using.html#con-oauth-authorization-keycloak-example).
+>>>>>>> ca13920be (Prepare for 0.28.0 (RC1))
 
 * [kafka-authz-realm.json](./kafka-authz-realm.json)
     * The Keycloak realm export file

diff --git a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -48,6 +48,7 @@ spec:
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
             - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
+<<<<<<< HEAD
               value: quay.io/strimzi/kafka:0.29.0-kafka-3.2.0
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
               value: quay.io/strimzi/kafka:0.29.0-kafka-3.2.0
@@ -87,14 +88,53 @@ spec:
               value: quay.io/strimzi/operator:0.29.0
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
               value: quay.io/strimzi/operator:0.29.0
+=======
+              value: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
+              value: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
+              value: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE
+              value: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_KAFKA_IMAGES
+              value: |
+                3.0.0=quay.io/strimzi/kafka:0.28.0-kafka-3.0.0
+                3.1.0=quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_KAFKA_CONNECT_IMAGES
+              value: |
+                3.0.0=quay.io/strimzi/kafka:0.28.0-kafka-3.0.0
+                3.1.0=quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
+              value: |
+                3.0.0=quay.io/strimzi/kafka:0.28.0-kafka-3.0.0
+                3.1.0=quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
+              value: |
+                3.0.0=quay.io/strimzi/kafka:0.28.0-kafka-3.0.0
+                3.1.0=quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
+            - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
+              value: quay.io/strimzi/operator:0.28.0
+            - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
+              value: quay.io/strimzi/operator:0.28.0
+            - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
+              value: quay.io/strimzi/operator:0.28.0
+>>>>>>> ca13920be (Prepare for 0.28.0 (RC1))
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
               value: quay.io/strimzi/kafka-bridge:0.21.5
             - name: STRIMZI_DEFAULT_JMXTRANS_IMAGE
+<<<<<<< HEAD
               value: quay.io/strimzi/jmxtrans:0.29.0
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
               value: quay.io/strimzi/kaniko-executor:0.29.0
             - name: STRIMZI_DEFAULT_MAVEN_BUILDER
               value: quay.io/strimzi/maven-builder:0.29.0
+=======
+              value: quay.io/strimzi/jmxtrans:0.28.0
+            - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
+              value: quay.io/strimzi/kaniko-executor:0.28.0
+            - name: STRIMZI_DEFAULT_MAVEN_BUILDER
+              value: quay.io/strimzi/maven-builder:0.28.0
+>>>>>>> ca13920be (Prepare for 0.28.0 (RC1))
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef: