Use application.properties from YAML in values

[it/dep.git] / ric-aux / 80-Auxiliary-Functions / helm / dashboard / templates / appconfig.yaml

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
similarity index 71%
rename from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml
rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
index e10805e..2930a15 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
@@ -15,22 +15,18 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-# Provides configuration parameters which spring expects as a JSON string
+# Defines a config map for mounting as file application.properties
 
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dashboard-configmap
+  name: {{ include "dashboard.fullname" . }}-appconfig
 data:
-  springApplication.json: |
-    {
-      "a1med": {
-        "basepath": "http://0.1.2.3:45"
-      },
-      "e2mgr": {
-        "basepath": "http://1.2.3.4:56"
-      },
-      "xappmgr": {
-        "basepath": "http://2.3.4.5:67"
-      }
-    }
+  # this key becomes the filename when mounted
+  application.properties: |
+    # appconfig.yaml
+    server.port = {{ .Values.dashboard.server.port }}
+    a1med.url =   {{ .Values.dashboard.properties.a1med.url   }}
+    anrxapp.url = {{ .Values.dashboard.properties.anrxapp.url }}
+    e2mgr.url =   {{ .Values.dashboard.properties.e2mgr.url   }}
+    xappmgr.url = {{ .Values.dashboard.properties.xappmgr.url }}