Merge "Add keys, values and volumes for properties files"

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

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
index 2b68de2..68e1925 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
@@ -15,20 +15,41 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-# Defines a config map for mounting as file application.properties
+# Defines multiple config maps for mounting as files; e.g., application.properties
+# The keys listed below MUST be configured in each deployment;
+# this list does not include all keys recognized by the app.
+# The template directives in the URL prefix definitions use common
+# K8S ingress values, but use Dashboard values if present.
 
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.dashboard" . }}-appconfig
 data:
-  # this key becomes the filename when mounted
+  # one key per file
   application.properties: |
-    # appconfig.yaml
-    server.port = {{ .Values.dashboard.service.http.containerPort }}
-    a1med.url =   {{ include "dashboard.endpoint.a1mediator" . }}
-    anrxapp.url = {{ include "dashboard.endpoint.anrxapp" . }}
-    e2mgr.url =   {{ include "dashboard.endpoint.e2mgr" . }}
-    # mock names for R1 testing, removing this entry disables the mock
-    e2mgr.mock.rannames = {{ .Values.dashboard.properties.e2mgr.mock.rannames }}
-    xappmgr.url = {{ include "dashboard.endpoint.xappmgr" . }}
+    server.port        = {{ include "common.serviceport.dashboard.container" . }}
+    userfile           = {{ .Values.dashboard.userfile }}
+    a1med.url.prefix   = {{ include "dashboard.prefix.a1mediator" . }}
+    a1med.url.suffix   = {{ .Values.dashboard.a1med.url.suffix   }}
+    anrxapp.url.prefix = {{ include "dashboard.prefix.anrxapp" . }}
+    anrxapp.url.suffix = {{ .Values.dashboard.anrxapp.url.suffix }}
+    appmgr.url.prefix  = {{ include "dashboard.prefix.appmgr" .  }}
+    appmgr.url.suffix  = {{ .Values.dashboard.appmgr.url.suffix  }}
+    e2mgr.url.prefix   = {{ include "dashboard.prefix.e2mgr" .   }}
+    e2mgr.url.suffix   = {{ .Values.dashboard.e2mgr.url.suffix   }}
+    portalapi.appname  = {{ .Values.dashboard.portalapi.appname  }}
+    portalapi.username = {{ .Values.dashboard.portalapi.username }}
+    portalapi.password = {{ .Values.dashboard.portalapi.password }}
+
+  key.properties: |
+    cipher.enc.key     = {{ .Values.dashboard.cipher.enc.key }}
+
+  portal.properties: |
+    # fixed values
+    portal.api.impl.class = org.oransc.ric.portal.dashboard.portalapi.PortalRestCentralServiceImpl
+    role_access_centralized = remote
+    # variable values
+    ecomp_redirect_url = {{ .Values.dashboard.portalapi.ecomp_redirect_url }}
+    ecomp_rest_url     = {{ .Values.dashboard.portalapi.ecomp_rest_url }}
+    ueb_app_key        = {{ .Values.dashboard.portalapi.ueb_app_key }}