From fbfc234895c48282e2e92b44c8c8b49745e81745 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Wed, 24 Jan 2024 09:39:21 +0000 Subject: Improve CSIT helm charts Kafka adverstised listener URL changed to FQDN. It does have an impact when kafka is accessed outside the namespace. Added quotes around kafka bootstrap to pass yaml linter. Issue-ID: POLICY-4402 Signed-off-by: aravind.est Change-Id: I898d5be3affed3a0f81589f03695ed8dbfd3d577 --- helm/cp-kafka/kafka.yaml | 2 +- .../resources/config/A1pmsParticipantParameters.yaml | 4 ++-- .../resources/config/HttpParticipantParameters.yaml | 4 ++-- .../resources/config/KubernetesParticipantParameters.yaml | 4 ++-- .../resources/config/KserveParticipantParameters.yaml | 4 ++-- .../resources/config/PolicyParticipantParameters.yaml | 4 ++-- .../components/policy-pap/resources/config/papParameters.yaml | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/helm/cp-kafka/kafka.yaml b/helm/cp-kafka/kafka.yaml index cc4677d8..db0ae748 100644 --- a/helm/cp-kafka/kafka.yaml +++ b/helm/cp-kafka/kafka.yaml @@ -42,7 +42,7 @@ spec: - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP value: PLAINTEXT:PLAINTEXT,PLAINTEXT_INTERNAL:PLAINTEXT - name: KAFKA_ADVERTISED_LISTENERS - value: PLAINTEXT://:29092,PLAINTEXT_INTERNAL://kafka:9092 + value: PLAINTEXT://:29092,PLAINTEXT_INTERNAL://kafka.default.svc.cluster.local:9092 - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR value: "1" - name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml index 17a8118b..77082fd6 100755 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml @@ -47,13 +47,13 @@ participant: topicSources: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 topicSinks: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka participantSupportedElementTypes: - diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml index a0cf2831..c3c4f98e 100644 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml @@ -39,14 +39,14 @@ participant: topicSources: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false topicSinks: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false participantSupportedElementTypes: diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml index b8e210a1..070ec50f 100644 --- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml @@ -42,7 +42,7 @@ participant: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false @@ -50,7 +50,7 @@ participant: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false participantSupportedElementTypes: diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml index 51eab747..249212b0 100755 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml @@ -46,13 +46,13 @@ participant: topicSources: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 topicSinks: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka participantSupportedElementTypes: - diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml index 7d5b50d7..4c29b547 100644 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml @@ -58,7 +58,7 @@ participant: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false @@ -66,7 +66,7 @@ participant: - topic: policy-acruntime-participant servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false participantSupportedElementTypes: diff --git a/helm/policy/components/policy-pap/resources/config/papParameters.yaml b/helm/policy/components/policy-pap/resources/config/papParameters.yaml index 83743e68..646b5ea8 100644 --- a/helm/policy/components/policy-pap/resources/config/papParameters.yaml +++ b/helm/policy/components/policy-pap/resources/config/papParameters.yaml @@ -68,7 +68,7 @@ pap: topicSources: - topic: ${pap.topic.pdp-pap.name} servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 @@ -76,19 +76,19 @@ pap: effectiveTopic: ${pap.topic.pdp-pap.name} consumerGroup: policy-pap servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 topicSinks: - topic: ${pap.topic.pdp-pap.name} servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false - topic: ${pap.topic.notification.name} servers: - - {{ .Values.global.kafkaServer }}:9092 + - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka useHttps: false healthCheckRestClientParameters: -- cgit 1.2.3-korg