From 0bc50d78c1313a908769bd3d18aa5ee0299852b8 Mon Sep 17 00:00:00 2001
From: jmarchel7bulls <jmarchel@7bulls.com>
Date: Tue, 23 Jul 2024 11:19:39 +0200
Subject: [PATCH] Passing sal creds through env vars

---
 charts/nebulous-exn-middleware/templates/deployment.yaml | 4 ++++
 exn-middleware-core/config/application-production.yml    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/nebulous-exn-middleware/templates/deployment.yaml b/charts/nebulous-exn-middleware/templates/deployment.yaml
index 17b4bbc..11026fd 100644
--- a/charts/nebulous-exn-middleware/templates/deployment.yaml
+++ b/charts/nebulous-exn-middleware/templates/deployment.yaml
@@ -44,6 +44,10 @@ spec:
               value: {{ .Values.SAL_HOST | default "nebulous-sal" | quote }}
             - name: 'SAL_PORT'
               value: {{ .Values.SAL_PORT | default "8080" | quote }}
+            - name: 'SAL_USER'
+              value: {{ required "SAL_USER required" | .Values.SAL_USER | quote }}
+            - name: 'SAL_PASSWORD'
+              value: {{ required "SAL_PASSWORD required" | .Values.SAL_PASSWORD | quote }}
             - name: 'ACTIVEMQ_HOST'
               value: {{ .Values.ACTIVEMQ_HOST | default "nebulous-activemq" | quote }}
             - name: 'ACTIVEMQ_PORT'
diff --git a/exn-middleware-core/config/application-production.yml b/exn-middleware-core/config/application-production.yml
index 272ba39..5603251 100644
--- a/exn-middleware-core/config/application-production.yml
+++ b/exn-middleware-core/config/application-production.yml
@@ -21,7 +21,7 @@ application:
     host: '${SAL_HOST:nebulous-sal}'
     port: '${SAL_PORT:8080}'
     api: 'sal'
-    username: 'admin'
-    password: 'admin'
+    username: '${SAL_USER}'
+    password: '${SAL_PASSWORD}'
   jms:
     topic: 'eu.nebulouscloud'
\ No newline at end of file