From ab90916598350b0c67fa48b57764a84ae7976851 Mon Sep 17 00:00:00 2001
From: Iulian Corcoja <iulian@corcoja.com>
Date: Wed, 12 Oct 2022 15:48:38 +0300
Subject: [PATCH] Update helm chart with additional eventing properties + use
 secret for password

---
 bmrg-flow/templates/configmap.yaml          | 11 ++---------
 bmrg-flow/templates/deployment-service.yaml |  5 +++++
 bmrg-flow/templates/secrets.yaml            |  3 +++
 bmrg-flow/values.yaml                       |  8 ++++++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bmrg-flow/templates/configmap.yaml b/bmrg-flow/templates/configmap.yaml
index 6f47109..1fe9552 100644
--- a/bmrg-flow/templates/configmap.yaml
+++ b/bmrg-flow/templates/configmap.yaml
@@ -22,17 +22,10 @@ data:
     {{ $k }}.service.root={{ if $.Values.global.ingress.root }}{{ $.Values.global.ingress.root }}{{ end }}/services/{{ $k }}
     {{- end }}
     {{- include "bmrg.core.services" $ | indent 4 }}
-    eventing.enabled={{ $values.eventing.enabled }}
-    {{- if $.Values.eventing.enabled }}
-    eventing.nats.server.urls={{ $values.eventing.natsUrls }}
+    eventing.nats.server.urls=nats://{{ $.Values.eventing.nats.user }}:${NATS_PASSWORD}@{{ $.Values.eventing.nats.host }}{{ if $.Values.eventing.nats.port }}:{{ $.Values.eventing.nats.port }}{{ end }}
     eventing.nats.server.reconnect-wait-time=PT10S
     eventing.nats.server.reconnect-max-attempts=-1
-    eventing.jetstream.stream.name={{ .Release.Name }}-event-stream
-    eventing.jetstream.stream.storage-type=File
-    eventing.jetstream.stream.subject={{ .Release.Name }}.event.cloudevent
-    eventing.jetstream.consumer.name={{ .Release.Name }}-event-consumer
-    eventing.jetstream.consumer.resub-wait-time=PT10S
-    {{- end }}
+    eventing.jetstream.input-events.consumer.resub-wait-time=PT10S
     {{- if $.Values.general.enable.debug }}
     logging.level.org.springframework.web.client.RestTemplate=DEBUG
     logging.level.org.springframework.core.env.PropertySourcesPropertyResolver=DEBUG
diff --git a/bmrg-flow/templates/deployment-service.yaml b/bmrg-flow/templates/deployment-service.yaml
index ecaed92..1bc90ed 100644
--- a/bmrg-flow/templates/deployment-service.yaml
+++ b/bmrg-flow/templates/deployment-service.yaml
@@ -56,6 +56,11 @@ spec:
               secretKeyRef:
                 name: {{ if $.Values.global.database.mongodb.secretName }}{{ $.Values.global.database.mongodb.secretName }}{{ else }}{{ include "bmrg.name" (dict "context" $context "tier" "secrets" ) }}{{ end }}
                 key: {{ if $.Values.global.database.mongodb.secretName }}mongodb-password{{ else }}MONGODB_PASSWORD{{ end }}
+          - name: NATS_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ if $.Values.eventing.nats.secretName }}{{ $.Values.eventing.nats.secretName }}{{ else }}{{ include "bmrg.name" (dict "context" $context "tier" "secrets" ) }}{{ end }}
+                key: {{ if $.Values.eventing.nats.secretName }}nats-password{{ else }}NATS_PASSWORD{{ end }}
           {{- if and (eq $k "workflow") }}
           - name: FLOW_OTC
             valueFrom:
diff --git a/bmrg-flow/templates/secrets.yaml b/bmrg-flow/templates/secrets.yaml
index 9da8053..acd25b0 100644
--- a/bmrg-flow/templates/secrets.yaml
+++ b/bmrg-flow/templates/secrets.yaml
@@ -29,6 +29,9 @@ data:
   {{- if not $.Values.global.database.mongodb.secretName }}
   MONGODB_PASSWORD: {{ $.Values.global.database.mongodb.password | b64enc }}
   {{- end }}
+  {{- if not $.Values.nats.eventing.secretName }}
+  NATS_PASSWORD: {{ $.Values.nats.eventing.password | b64enc }}
+  {{- end }}
   FLOW_OTC: {{ $otc }}
   FLOW_ENCRYPT_SECRET: {{ $encryptSecret }}
   FLOW_ENCRYPT_SALT: {{ $encryptSalt }}
\ No newline at end of file
diff --git a/bmrg-flow/values.yaml b/bmrg-flow/values.yaml
index 751a586..adf52b4 100644
--- a/bmrg-flow/values.yaml
+++ b/bmrg-flow/values.yaml
@@ -172,8 +172,12 @@ monitoring:
 
 # Eventing related values
 eventing:
-  enabled: false
-  natsUrls: nats://bmrg-dev-nats:4222
+  nats:
+    host: bmrg-dev-nats
+    port: 4222
+    user: flow
+    password: flow
+    secretName:
 
 tekton:
   enabled: true