From 0673de941307e4b29853706750542a446fea82f0 Mon Sep 17 00:00:00 2001 From: Bruno Sakoto Date: Mon, 13 Sep 2021 17:25:39 -0400 Subject: [CPS] Improve cps temporal charts * To be consistent, kafka configuration can now be provided using config.eventConsumption properties, for all protocols. * Default topic name is set to 'cps.data-updated-events' to reflect the type of events it receives. * CPS readme file is removed. Issue-ID: CPS-672 Signed-off-by: Bruno Sakoto Change-Id: Iaaf1f330389c5b37277e5c8dce66dff69f5a49a9 --- .../cps-temporal/resources/config/application-helm.yml | 15 +++++---------- kubernetes/cps/components/cps-temporal/values.yaml | 15 ++++++++------- 2 files changed, 13 insertions(+), 17 deletions(-) (limited to 'kubernetes/cps/components/cps-temporal') diff --git a/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml b/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml index 6654b26556..32ae51b51a 100644 --- a/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml +++ b/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml @@ -23,23 +23,18 @@ spring: url: jdbc:postgresql://{{ .Values.timescaledb.service.name }}:5432/{{ .Values.timescaledb.config.pgDatabase }} username: ${DB_USERNAME} password: ${DB_PASSWORD} - kafka: - bootstrap-servers: [{{ .Values.config.kafka.service }}:{{ .Values.config.kafka.port }}] - security: - protocol: {{ .Values.config.kafka.protocol }} - consumer: - group-id: {{ .Values.config.kafka.consumerGroupId }} security: auth: username: ${APP_USERNAME} password: ${APP_PASSWORD} -app: - listener: - data-updated: - topic: {{ .Values.config.kafka.listenerTopic }} +# Event consumption properties (kafka) +{{- if .Values.config.eventConsumption }} +{{ toYaml .Values.config.eventConsumption | nindent 2 }} +{{- end }} +# Additional properties {{- if .Values.config.additional }} {{ toYaml .Values.config.additional | nindent 2 }} {{- end }} diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml index 6874fa2ff0..da055d0242 100644 --- a/kubernetes/cps/components/cps-temporal/values.yaml +++ b/kubernetes/cps/components/cps-temporal/values.yaml @@ -140,19 +140,20 @@ config: profile: helm #appUserPassword: + # Event consumption (kafka) properties + # All Kafka properties must be in "key: value" format instead of yaml. + eventConsumption: + spring.kafka.bootstrap-servers: message-router-kafka:9092 + spring.kafka.security.protocol: PLAINTEXT + spring.kafka.consumer.group-id: cps-temporal-group + app.listener.data-updated.topic: cps.data-updated-events + # Any new property can be added in the env by setting in overrides in the format mentioned below # All the added properties must be in "key: value" format instead of yaml. # additional: # spring.config.max-size: 200 # spring.config.min-size: 10 - kafka: - service: message-router-kafka - port: 9092 - listenerTopic: cps.cfg-state-events - consumerGroupId: cps-temporal-group - protocol: PLAINTEXT - logging: level: INFO path: /tmp -- cgit 1.2.3-korg