Change paths after zookeeper -> kraft migration (#381)

Signed-off-by: Jakub Stejskal <[email protected]>
skodjob · Sep 6, 2024 · dc20834 · dc20834
1 parent 95f1c35
commit dc20834
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 30 deletions.
diff --git a/install/roles/automation-hub/templates/strimzi/kafka/00-kafka.yaml b/install/roles/automation-hub/templates/strimzi/kafka/00-kafka.yaml
@@ -22,14 +22,38 @@ spec:
     limits:
       memory: 1Gi
       cpu: "1"
+  template:
+    clusterCaCert:
+      metadata:
+        annotations:
+          replicator.v1.mittwald.de/replicate-to-matching: "strimzi.io/sync-secrets=true"
+    pod:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: nodetype
+                    operator: In
+                    values:
+                      - worker
+      topologySpreadConstraints:
+        # Deploy Kafka pods with spread with difference max 1 pod
+        - maxSkew: 4
+          # All nodes with same key are considered as one group, so we should pick a key, which has different values on the nodes
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              # label on Kafka pods
+              strimzi.io/name: event-bus-kafka
 ---
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaNodePool
 metadata:
   name: broker
   labels:
     strimzi.io/cluster: event-bus
-    mode: kraft
 spec:
   replicas: 5
   roles:
@@ -48,6 +72,31 @@ spec:
     limits:
       memory: 2Gi
       cpu: "1"
+  template:
+    clusterCaCert:
+      metadata:
+        annotations:
+          replicator.v1.mittwald.de/replicate-to-matching: "strimzi.io/sync-secrets=true"
+    pod:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: nodetype
+                    operator: In
+                    values:
+                      - worker
+      topologySpreadConstraints:
+        # Deploy Kafka pods with spread with difference max 1 pod
+        - maxSkew: 4
+          # All nodes with same key are considered as one group, so we should pick a key, which has different values on the nodes
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              # label on Kafka pods
+              strimzi.io/name: event-bus-kafka
 ---
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
@@ -99,33 +148,6 @@ spec:
         configMapKeyRef:
           key: event-bus-kafka-jmx-exporter-configuration.yaml
           name: event-bus-kafka-jmx-exporter-configuration
-    template:
-      clusterCaCert:
-        metadata:
-          annotations:
-            replicator.v1.mittwald.de/replicate-to-matching: "strimzi.io/sync-secrets=true"
-      podDisruptionBudget:
-        maxUnavailable: 0
-      pod:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-                - matchExpressions:
-                    - key: nodetype
-                      operator: In
-                      values:
-                        - worker
-        topologySpreadConstraints:
-          # Deploy Kafka pods with spread with difference max 1 pod
-          - maxSkew: 4
-            # All nodes with same key are considered as one group, so we should pick a key, which has different values on the nodes
-            topologyKey: kubernetes.io/hostname
-            whenUnsatisfiable: DoNotSchedule
-            labelSelector:
-              matchLabels:
-                # label on Kafka pods
-                strimzi.io/name: event-bus-kafka
   entityOperator:
     template:
       pod:

diff --git a/...s/automation-hub/templates/tekton/pipelines/strimzi-deployment/image-changer-trigger.yaml b/...s/automation-hub/templates/tekton/pipelines/strimzi-deployment/image-changer-trigger.yaml
@@ -59,7 +59,7 @@ data:
     set -x
     set -e
     
-    wget https://raw.githubusercontent.com/skodjob/deployment-hub/main/strimzi/zookeeper-mode/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml -O "${WORKSPACE}"/deployment-operator.yaml
+    wget https://raw.githubusercontent.com/skodjob/deployment-hub/main/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml -O "${WORKSPACE}"/deployment-operator.yaml
     DIGEST_OPERATOR=$(skopeo inspect docker://quay.io/strimzi/operator:latest | jq -r '.Digest' )
     
     if ! grep "${DIGEST_OPERATOR}" "${WORKSPACE}"/deployment-operator.yaml; then

diff --git a/...utomation-hub/templates/tekton/pipelines/strimzi-deployment/strimzi-image-updater.yaml.j2 b/...utomation-hub/templates/tekton/pipelines/strimzi-deployment/strimzi-image-updater.yaml.j2
@@ -35,7 +35,7 @@ spec:
               - name: SHARED_YAML_BUNDLE_FILES
                 value: "./strimzi/cluster-operator-common/"
               - name: YAML_BUNDLE_PATHS
-                value: "./strimzi/zookeeper-mode/cluster-operator/,./strimzi/kraft-mode/cluster-operator"
+                value: "./strimzi/main/cluster-operator/,./strimzi/mirror/cluster-operator"
               - name: TARGET_ORG_REPO
                 value: "quay.io/strimzi"
               - name: BRANCH