FIX certificates for flights-external-producer and also revert bridge…

… image (#174) * Temporarly use custom kafka clients image with several fixes Signed-off-by: Jakub Stejskal <[email protected]> * Revert image after pushing the fix Signed-off-by: Jakub Stejskal <[email protected]> * Debug clients Signed-off-by: Jakub Stejskal <[email protected]> * Add proper certs Signed-off-by: Jakub Stejskal <[email protected]> * Use released version of bridge for now Signed-off-by: Jakub Stejskal <[email protected]> * Run make kustomize Signed-off-by: Jakub Stejskal <[email protected]> * Remove deprecated things from kustomize Signed-off-by: Jakub Stejskal <[email protected]> * Fix lint Signed-off-by: Jakub Stejskal <[email protected]> * Fix lint v2 Signed-off-by: Jakub Stejskal <[email protected]> * Fix lint v3 Signed-off-by: Jakub Stejskal <[email protected]> --------- Signed-off-by: Jakub Stejskal <[email protected]>
skodjob · Jan 13, 2025 · 1c30923 · 1c30923
1 parent 8e6227e
commit 1c30923
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 76 deletions.
diff --git a/strimzi/main/clients-kustomize/base/kustomization.yaml b/strimzi/main/clients-kustomize/base/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
 images:
   - name: clients-image
     newName: quay.io/strimzi-test-clients/test-clients
-    newTag: latest-kafka-3.8.0
+    newTag: latest-kafka-3.9.0
diff --git a/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: flights-external-
-commonLabels:
-  type: flights-external
 
 replicas:
-  - name: producer
-    count: 7
-  - name: consumer
-    count: 20
-  - name: streams
-    count: 4
+  - count: 7
+    name: producer
+  - count: 20
+    name: consumer
+  - count: 4
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: flights-external
diff --git a/strimzi/main/clients-kustomize/overlays/flights-external/producer.yaml b/strimzi/main/clients-kustomize/overlays/flights-external/producer.yaml
@@ -15,5 +15,9 @@ spec:
               value: flights-external-data
             - name: DELAY_MS
               value: "50"
+            - name: USER_CRT
+              value: ${secrets:strimzi-kafka/kafka-external-producer:user.crt}
+            - name: USER_KEY
+              value: ${secrets:strimzi-kafka/kafka-external-producer:user.key}
             - name: BOOTSTRAP_SERVERS
               value: anubis-kafka-automation-bootstrap-strimzi-kafka.apps.worker-01.strimzi.app-services-dev.net:443
diff --git a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: flights-internal-
-commonLabels:
-  type: flights-internal
 
 replicas:
-  - name: producer
-    count: 7
-  - name: consumer
-    count: 20
-  - name: streams
-    count: 3
+  - count: 7
+    name: producer
+  - count: 20
+    name: consumer
+  - count: 3
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: flights-internal
diff --git a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml
@@ -2,12 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: http-internal-
-commonLabels:
-  type: http-internal
 
 replicas:
-  - name: producer
-    count: 7
+  - count: 7
+    name: producer
 
 resources:
   - ../../base
@@ -22,3 +20,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: http-internal
diff --git a/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: iot-external-
-commonLabels:
-  type: iot-external
 
 replicas:
-  - name: producer
-    count: 8
-  - name: consumer
-    count: 4
-  - name: streams
-    count: 4
+  - count: 8
+    name: producer
+  - count: 4
+    name: consumer
+  - count: 4
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: iot-external
diff --git a/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: iot-internal-
-commonLabels:
-  type: iot-internal
 
 replicas:
-  - name: producer
-    count: 8
-  - name: consumer
-    count: 4
-  - name: streams
-    count: 4
+  - count: 8
+    name: producer
+  - count: 4
+    name: consumer
+  - count: 4
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: iot-internal
diff --git a/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: payment-external-
-commonLabels:
-  type: payment-external
 
 replicas:
-  - name: producer
-    count: 9
-  - name: consumer
-    count: 20
-  - name: streams
-    count: 3
+  - count: 9
+    name: producer
+  - count: 20
+    name: consumer
+  - count: 3
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: payment-external
diff --git a/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml
@@ -2,16 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namePrefix: payment-internal-
-commonLabels:
-  type: payment-internal
 
 replicas:
-  - name: producer
-    count: 9
-  - name: consumer
-    count: 20
-  - name: streams
-    count: 3
+  - count: 9
+    name: producer
+  - count: 20
+    name: consumer
+  - count: 3
+    name: streams
 
 resources:
   - ../../base
@@ -26,3 +24,7 @@ patches:
   - path: streams.yaml
     target:
       name: streams
+labels:
+  - includeSelectors: true
+    pairs:
+      type: payment-internal