From 7c20b405603297a48b515b0ecdb7095e24607128 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Sat, 11 Jan 2025 13:59:24 +0100 Subject: [PATCH 01/10] Temporarly use custom kafka clients image with several fixes Signed-off-by: Jakub Stejskal --- .../clients-kustomize/base/kustomization.yaml | 4 +- strimzi/main/clients/01-clients.yaml | 42 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/strimzi/main/clients-kustomize/base/kustomization.yaml b/strimzi/main/clients-kustomize/base/kustomization.yaml index 9bb9d799..78690d5e 100644 --- a/strimzi/main/clients-kustomize/base/kustomization.yaml +++ b/strimzi/main/clients-kustomize/base/kustomization.yaml @@ -8,5 +8,5 @@ resources: images: - name: clients-image - newName: quay.io/strimzi-test-clients/test-clients - newTag: latest-kafka-3.8.0 + newName: quay.io/jstejska/test-clients + newTag: fix-string-kafka-3.8.0 diff --git a/strimzi/main/clients/01-clients.yaml b/strimzi/main/clients/01-clients.yaml index 7022dbec..5c5fbc38 100644 --- a/strimzi/main/clients/01-clients.yaml +++ b/strimzi/main/clients/01-clients.yaml @@ -46,7 +46,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -112,7 +112,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -177,7 +177,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -242,7 +242,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -312,7 +312,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -377,7 +377,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -444,7 +444,7 @@ spec: value: INFO - name: MESSAGE_COUNT value: "10000000" - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -514,7 +514,7 @@ spec: - name: PRODUCER_ACKS value: all - name: ADDITIONAL_CONFIG - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -567,7 +567,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -632,7 +632,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -702,7 +702,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -767,7 +767,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -832,7 +832,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -902,7 +902,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -967,7 +967,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -1032,7 +1032,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -1102,7 +1102,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -1167,7 +1167,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: @@ -1232,7 +1232,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: consumer resources: @@ -1302,7 +1302,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: producer resources: @@ -1367,7 +1367,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.8.0 + image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 imagePullPolicy: Always name: streams resources: From fd877be6e944074318793259d52b9569e0d0f701 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 16:03:36 +0100 Subject: [PATCH 02/10] Revert image after pushing the fix Signed-off-by: Jakub Stejskal --- .../clients-kustomize/base/kustomization.yaml | 4 +- strimzi/main/clients/01-clients.yaml | 42 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/strimzi/main/clients-kustomize/base/kustomization.yaml b/strimzi/main/clients-kustomize/base/kustomization.yaml index 78690d5e..e6182af0 100644 --- a/strimzi/main/clients-kustomize/base/kustomization.yaml +++ b/strimzi/main/clients-kustomize/base/kustomization.yaml @@ -8,5 +8,5 @@ resources: images: - name: clients-image - newName: quay.io/jstejska/test-clients - newTag: fix-string-kafka-3.8.0 + newName: quay.io/strimzi-test-clients/test-clients + newTag: latest-kafka-3.9.0 diff --git a/strimzi/main/clients/01-clients.yaml b/strimzi/main/clients/01-clients.yaml index 5c5fbc38..4c19ba81 100644 --- a/strimzi/main/clients/01-clients.yaml +++ b/strimzi/main/clients/01-clients.yaml @@ -46,7 +46,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -112,7 +112,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -177,7 +177,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -242,7 +242,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -312,7 +312,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -377,7 +377,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -444,7 +444,7 @@ spec: value: INFO - name: MESSAGE_COUNT value: "10000000" - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -514,7 +514,7 @@ spec: - name: PRODUCER_ACKS value: all - name: ADDITIONAL_CONFIG - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -567,7 +567,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -632,7 +632,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -702,7 +702,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -767,7 +767,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -832,7 +832,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -902,7 +902,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -967,7 +967,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -1032,7 +1032,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -1102,7 +1102,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -1167,7 +1167,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: @@ -1232,7 +1232,7 @@ spec: value: "10000000" - name: CLIENT_TYPE value: KafkaConsumer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: consumer resources: @@ -1302,7 +1302,7 @@ spec: - name: ADDITIONAL_CONFIG - name: CLIENT_TYPE value: KafkaProducer - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: producer resources: @@ -1367,7 +1367,7 @@ spec: value: INFO - name: CLIENT_TYPE value: KafkaStreams - image: quay.io/jstejska/test-clients:fix-string-kafka-3.8.0 + image: quay.io/strimzi-test-clients/test-clients:latest-kafka-3.9.0 imagePullPolicy: Always name: streams resources: From 6fed796ce10090605ff339d9ab118c75f1e648ef Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 16:11:18 +0100 Subject: [PATCH 03/10] Debug clients Signed-off-by: Jakub Stejskal --- strimzi/main/clients-kustomize/base/producer.yaml | 2 +- strimzi/main/clients/01-clients.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/strimzi/main/clients-kustomize/base/producer.yaml b/strimzi/main/clients-kustomize/base/producer.yaml index 57642b1b..59444c8d 100755 --- a/strimzi/main/clients-kustomize/base/producer.yaml +++ b/strimzi/main/clients-kustomize/base/producer.yaml @@ -31,7 +31,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: "INFO" + value: "DEBUG" - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS diff --git a/strimzi/main/clients/01-clients.yaml b/strimzi/main/clients/01-clients.yaml index 4c19ba81..65f492a5 100644 --- a/strimzi/main/clients/01-clients.yaml +++ b/strimzi/main/clients/01-clients.yaml @@ -104,7 +104,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -304,7 +304,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -508,7 +508,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -694,7 +694,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -894,7 +894,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -1094,7 +1094,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -1294,7 +1294,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: INFO + value: DEBUG - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS From 7cf114c8bd9bdadaa3d389e5095503f3424f8f12 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 16:40:33 +0100 Subject: [PATCH 04/10] Add proper certs Signed-off-by: Jakub Stejskal --- strimzi/main/clients-kustomize/base/producer.yaml | 2 +- .../clients-kustomize/overlays/flights-external/producer.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/strimzi/main/clients-kustomize/base/producer.yaml b/strimzi/main/clients-kustomize/base/producer.yaml index 59444c8d..57642b1b 100755 --- a/strimzi/main/clients-kustomize/base/producer.yaml +++ b/strimzi/main/clients-kustomize/base/producer.yaml @@ -31,7 +31,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: "DEBUG" + value: "INFO" - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS diff --git a/strimzi/main/clients-kustomize/overlays/flights-external/producer.yaml b/strimzi/main/clients-kustomize/overlays/flights-external/producer.yaml index 5b233189..947128ee 100644 --- 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 From e714e2cff2040927979d0d0fba2b84421bdd1cc9 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 16:46:12 +0100 Subject: [PATCH 05/10] Use released version of bridge for now Signed-off-by: Jakub Stejskal --- .../060-Deployment-strimzi-cluster-operator.yaml | 2 +- .../060-Deployment-strimzi-cluster-operator.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index 9085b8b5..210f80ef 100755 --- a/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -74,7 +74,7 @@ spec: - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE value: quay.io/strimzi/operator@sha256:885155739f3ed7a031704d96fb0236ad3ad9cc1d1e6d9cfdebfdda7e0bb22817 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: quay.io/strimzi/kafka-bridge@sha256:06d924ec4a273bced9a1c24dc89caa086c9719618e178c680b268b804e04cdab + value: quay.io/strimzi/kafka-bridge:0.31.1 - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE value: quay.io/strimzi/kaniko-executor@sha256:ef1a39c363e145041d80103c3c12da9429ce06cf21dff6fb1fb75d0c0ed9c35b - name: STRIMZI_DEFAULT_MAVEN_BUILDER diff --git a/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index cd5417a3..3e2bad9a 100755 --- a/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -74,7 +74,7 @@ spec: - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE value: quay.io/strimzi/operator@sha256:885155739f3ed7a031704d96fb0236ad3ad9cc1d1e6d9cfdebfdda7e0bb22817 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: quay.io/strimzi/kafka-bridge@sha256:06d924ec4a273bced9a1c24dc89caa086c9719618e178c680b268b804e04cdab + value: quay.io/strimzi/kafka-bridge:0.31.1 - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE value: quay.io/strimzi/kaniko-executor@sha256:ef1a39c363e145041d80103c3c12da9429ce06cf21dff6fb1fb75d0c0ed9c35b - name: STRIMZI_DEFAULT_MAVEN_BUILDER From 2478a959911f4879201d7a43323bc2fa5cff340b Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 18:39:17 +0100 Subject: [PATCH 06/10] Run make kustomize Signed-off-by: Jakub Stejskal --- strimzi/main/clients/01-clients.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/strimzi/main/clients/01-clients.yaml b/strimzi/main/clients/01-clients.yaml index 65f492a5..db08cfa2 100644 --- a/strimzi/main/clients/01-clients.yaml +++ b/strimzi/main/clients/01-clients.yaml @@ -99,12 +99,16 @@ 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 - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -304,7 +308,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -508,7 +512,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -694,7 +698,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -894,7 +898,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -1094,7 +1098,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS @@ -1294,7 +1298,7 @@ spec: - name: CA_CRT value: ${secrets:strimzi-kafka/anubis-cluster-ca-cert:ca.crt} - name: LOG_LEVEL - value: DEBUG + value: INFO - name: MESSAGE_COUNT value: "10000000" - name: PRODUCER_ACKS From 8c88e7aa4080a9ef7f64b4d0512485141c6090f9 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 18:43:56 +0100 Subject: [PATCH 07/10] Remove deprecated things from kustomize Signed-off-by: Jakub Stejskal --- .../clients-kustomize/base/kustomization.yaml | 12 +++--- .../flights-external/kustomization.yaml | 38 ++++++++++--------- .../flights-internal/kustomization.yaml | 38 ++++++++++--------- .../overlays/http-internal/kustomization.yaml | 30 ++++++++------- .../overlays/iot-external/kustomization.yaml | 38 ++++++++++--------- .../overlays/iot-internal/kustomization.yaml | 38 ++++++++++--------- .../payment-external/kustomization.yaml | 38 ++++++++++--------- .../payment-internal/kustomization.yaml | 38 ++++++++++--------- 8 files changed, 142 insertions(+), 128 deletions(-) diff --git a/strimzi/main/clients-kustomize/base/kustomization.yaml b/strimzi/main/clients-kustomize/base/kustomization.yaml index e6182af0..c0ed0194 100644 --- a/strimzi/main/clients-kustomize/base/kustomization.yaml +++ b/strimzi/main/clients-kustomize/base/kustomization.yaml @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - producer.yaml - - consumer.yaml - - streams.yaml +- producer.yaml +- consumer.yaml +- streams.yaml images: - - name: clients-image - newName: quay.io/strimzi-test-clients/test-clients - newTag: latest-kafka-3.9.0 +- name: clients-image + newName: quay.io/strimzi-test-clients/test-clients + 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 index 56768f26..a954e202 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- path: streams.yaml + target: + name: streams +labels: +- includeSelectors: true + pairs: + type: flights-external diff --git a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml index 6a26dd40..b7190975 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- 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 index ca6e94f6..38cc615e 100644 --- a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml @@ -2,23 +2,25 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- 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 index 5c4a6c93..e17f6eb0 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- 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 index 082e572a..8d2f21bf 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- 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 index cb508f69..324e5824 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- 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 index c8fbeac4..5c2e790c 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml @@ -2,27 +2,29 @@ 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 +- ../../base patches: - - path: producer.yaml - target: - name: producer - - path: consumer.yaml - target: - name: consumer - - path: streams.yaml - target: - name: streams +- path: producer.yaml + target: + name: producer +- path: consumer.yaml + target: + name: consumer +- path: streams.yaml + target: + name: streams +labels: +- includeSelectors: true + pairs: + type: payment-internal From bd6434f37c3f216e679c4bde188eb9249a7a8e19 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 18:49:30 +0100 Subject: [PATCH 08/10] Fix lint Signed-off-by: Jakub Stejskal --- .../clients-kustomize/base/kustomization.yaml | 12 +++---- .../flights-external/kustomization.yaml | 36 +++++++++---------- .../flights-internal/kustomization.yaml | 36 +++++++++---------- .../overlays/http-internal/kustomization.yaml | 24 ++++++------- .../overlays/iot-external/kustomization.yaml | 36 +++++++++---------- .../overlays/iot-internal/kustomization.yaml | 36 +++++++++---------- .../payment-external/kustomization.yaml | 36 +++++++++---------- .../payment-internal/kustomization.yaml | 36 +++++++++---------- 8 files changed, 126 insertions(+), 126 deletions(-) diff --git a/strimzi/main/clients-kustomize/base/kustomization.yaml b/strimzi/main/clients-kustomize/base/kustomization.yaml index c0ed0194..e6182af0 100644 --- a/strimzi/main/clients-kustomize/base/kustomization.yaml +++ b/strimzi/main/clients-kustomize/base/kustomization.yaml @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- producer.yaml -- consumer.yaml -- streams.yaml + - producer.yaml + - consumer.yaml + - streams.yaml images: -- name: clients-image - newName: quay.io/strimzi-test-clients/test-clients - newTag: latest-kafka-3.9.0 + - name: clients-image + newName: quay.io/strimzi-test-clients/test-clients + 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 index a954e202..50d21787 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: flights-external- replicas: -- count: 7 - name: producer -- count: 20 - name: consumer -- count: 4 - name: streams + - count: 7 + name: producer + - count: 20 + name: consumer + - count: 4 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: flights-external + - includeSelectors: true + pairs: + type: flights-external diff --git a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml index b7190975..a276c4aa 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: flights-internal- replicas: -- count: 7 - name: producer -- count: 20 - name: consumer -- count: 3 - name: streams + - count: 7 + name: producer + - count: 20 + name: consumer + - count: 3 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: flights-internal + - 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 index 38cc615e..dba6edd6 100644 --- a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml @@ -11,16 +11,16 @@ resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: http-internal + - 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 index e17f6eb0..9cd1b40f 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: iot-external- replicas: -- count: 8 - name: producer -- count: 4 - name: consumer -- count: 4 - name: streams + - count: 8 + name: producer + - count: 4 + name: consumer + - count: 4 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: iot-external + - 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 index 8d2f21bf..c551f811 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: iot-internal- replicas: -- count: 8 - name: producer -- count: 4 - name: consumer -- count: 4 - name: streams + - count: 8 + name: producer + - count: 4 + name: consumer + - count: 4 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: iot-internal + - 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 index 324e5824..d1426ab6 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: payment-external- replicas: -- count: 9 - name: producer -- count: 20 - name: consumer -- count: 3 - name: streams + - count: 9 + name: producer + - count: 20 + name: consumer + - count: 3 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: payment-external + - 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 index 5c2e790c..d08c99e3 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml @@ -4,27 +4,27 @@ kind: Kustomization namePrefix: payment-internal- replicas: -- count: 9 - name: producer -- count: 20 - name: consumer -- count: 3 - name: streams + - count: 9 + name: producer + - count: 20 + name: consumer + - count: 3 + name: streams resources: - ../../base patches: -- path: producer.yaml - target: - name: producer -- path: consumer.yaml - target: - name: consumer -- path: streams.yaml - target: - name: streams + - path: producer.yaml + target: + name: producer + - path: consumer.yaml + target: + name: consumer + - path: streams.yaml + target: + name: streams labels: -- includeSelectors: true - pairs: - type: payment-internal + - includeSelectors: true + pairs: + type: payment-internal From fcade4aa2a7820bc18e42751367af90c96804d5a Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 18:52:41 +0100 Subject: [PATCH 09/10] Fix lint v2 Signed-off-by: Jakub Stejskal --- .../overlays/flights-external/kustomization.yaml | 2 +- .../overlays/flights-internal/kustomization.yaml | 2 +- .../clients-kustomize/overlays/http-internal/kustomization.yaml | 2 +- .../clients-kustomize/overlays/iot-external/kustomization.yaml | 2 +- .../clients-kustomize/overlays/iot-internal/kustomization.yaml | 2 +- .../overlays/payment-external/kustomization.yaml | 2 +- .../overlays/payment-internal/kustomization.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml index 50d21787..a6364ae3 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-external/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml index a276c4aa..692cbe36 100644 --- a/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/flights-internal/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml index dba6edd6..08b11258 100644 --- a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml @@ -8,7 +8,7 @@ replicas: name: producer resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml index 9cd1b40f..33a8621e 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-external/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml index c551f811..4ca7266e 100644 --- a/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/iot-internal/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml index d1426ab6..fcb9be99 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-external/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml diff --git a/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml index d08c99e3..419c25d0 100644 --- a/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/payment-internal/kustomization.yaml @@ -12,7 +12,7 @@ replicas: name: streams resources: -- ../../base + - ../../base patches: - path: producer.yaml From 5d3b7363f681615db5a74438579d4dd7be0e9a2e Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 13 Jan 2025 18:53:50 +0100 Subject: [PATCH 10/10] Fix lint v3 Signed-off-by: Jakub Stejskal --- .../overlays/http-internal/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml index 08b11258..79ffd60c 100644 --- a/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml +++ b/strimzi/main/clients-kustomize/overlays/http-internal/kustomization.yaml @@ -4,8 +4,8 @@ kind: Kustomization namePrefix: http-internal- replicas: -- count: 7 - name: producer + - count: 7 + name: producer resources: - ../../base