diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2023-02-20 17:05:30 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2023-02-21 17:21:26 +0000 |
| commit | 9f2a0a07f134c9f5346ae241bb24748068e4f6bd (patch) | |
| tree | dc9049f38d9d0d63e4880281a91ad83c782fe1ba /kubernetes/cps/components/cps-core/resources/config | |
| parent | 23f5499dad42a1147b4edbd6d7b6480895d985bc (diff) | |
[CPS] Change cps-core/temporal to use strimzi templates
CPS core and temporal will now use the custom strimzi kafka tmplates
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I3a25e036e3bc2315c335424f624ebf6d538994e2
Issue-ID: CPS-1503
Diffstat (limited to 'kubernetes/cps/components/cps-core/resources/config')
| -rw-r--r-- | kubernetes/cps/components/cps-core/resources/config/application-helm.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml index f9bb230161..fd3068e6a6 100644 --- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml +++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml @@ -1,7 +1,7 @@ {{/* # Copyright (C) 2021 Pantheon.tech # Modifications Copyright (C) 2020 Bell Canada. -# Modifications Copyright (C) 2021-2022 Nordix Foundation. +# Modifications Copyright (C) 2021-2023 Nordix Foundation. # Modifications Copyright (C) 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,14 +54,13 @@ ncmp: username: ${DMI_USERNAME} password: ${DMI_PASSWORD} -{{- if .Values.config.useStrimziKafka }} -spring.kafka.bootstrap-servers: {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092 -spring.kafka.security.protocol: SASL_PLAINTEXT -spring.kafka.properties.sasl.mechanism: SCRAM-SHA-512 -spring.kafka.properties.sasl.jaas.config: ${JAASLOGIN} -{{ else }} -{{ toYaml .Values.config.eventPublisher | nindent 2 }} +{{- with (first .Values.kafkaUser.acls) }} +spring.kafka.consumer.group-id: {{ .name }} {{- end }} +spring.kafka.bootstrap-servers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092 +spring.kafka.security.protocol: SASL_PLAINTEXT +spring.kafka.properties.sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }} +spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG} {{- if .Values.config.additional }} {{ toYaml .Values.config.additional | nindent 2 }} |