From d8a82421f9e7a4812bce467198920de92b675fd4 Mon Sep 17 00:00:00 2001
From: gsavvas <gsavvas@existanze.com>
Date: Wed, 8 May 2024 16:53:56 +0300
Subject: [PATCH] Change default SAL_HOST to nebulous-sal

Change-Id: Idb18d729e39482e9d7749b07781eb2edfce0243e
---
 charts/nebulous-exn-middleware/templates/deployment.yaml | 9 +++++++++
 exn-middleware-core/Dockerfile                           | 3 ++-
 exn-middleware-core/config/application-production.yml    | 8 ++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/charts/nebulous-exn-middleware/templates/deployment.yaml b/charts/nebulous-exn-middleware/templates/deployment.yaml
index dce6951..17b4bbc 100644
--- a/charts/nebulous-exn-middleware/templates/deployment.yaml
+++ b/charts/nebulous-exn-middleware/templates/deployment.yaml
@@ -39,6 +39,15 @@ spec:
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          env:
+            - name: 'SAL_HOST'
+              value: {{ .Values.SAL_HOST | default "nebulous-sal" | quote }}
+            - name: 'SAL_PORT'
+              value: {{ .Values.SAL_PORT | default "8080" | quote }}
+            - name: 'ACTIVEMQ_HOST'
+              value: {{ .Values.ACTIVEMQ_HOST | default "nebulous-activemq" | quote }}
+            - name: 'ACTIVEMQ_PORT'
+              value: {{ .Values.ACTIVEMQ_PORT | default "5672" | quote }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/exn-middleware-core/Dockerfile b/exn-middleware-core/Dockerfile
index b462200..4464879 100644
--- a/exn-middleware-core/Dockerfile
+++ b/exn-middleware-core/Dockerfile
@@ -2,7 +2,8 @@
 FROM docker.io/library/openjdk:11 AS builder
 
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y maven=3.6.3-5
+    apt-get install --no-install-recommends -y \
+    maven=3.6.3-5
 
 #Set the working directory
 WORKDIR /app
diff --git a/exn-middleware-core/config/application-production.yml b/exn-middleware-core/config/application-production.yml
index 5fd1af6..272ba39 100644
--- a/exn-middleware-core/config/application-production.yml
+++ b/exn-middleware-core/config/application-production.yml
@@ -12,14 +12,14 @@ spring:
 application:
   exn:
     config:
-      url: 'nebulous-activemq'
-      port: '5672'
+      url: '${ACTIVEMQ_HOST:nebulous-activemq}'
+      port: '${ACTIVEMQ_PORT:5672}'
       username: 'admin'
       password: 'admin'
   sal:
     protocol: 'http'
-    host: 'sal'
-    port: '8080'
+    host: '${SAL_HOST:nebulous-sal}'
+    port: '${SAL_PORT:8080}'
     api: 'sal'
     username: 'admin'
     password: 'admin'