Create RMR route listening services. Further integrating charts with common template.

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

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml
index a4b311d..adacef2 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml
@@ -18,10 +18,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dashboard.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.deploymentname.dashboard" . }}
+  namespace: {{ include "common.namespace.aux" . }}
   labels:
-    app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.dashboard" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -29,24 +29,24 @@ spec:
   replicas: {{ .Values.dashboard.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.aux" . }}-{{ include "common.name.dashboard" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.aux" . }}-{{ include "common.name.dashboard" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ .Chart.Name }}
+      hostname: {{ include "common.name.dashboard" . }}
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
-        - name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        - name: {{ include "common.containername.dashboard" . }}
           image: {{ include "common.repository" . }}/{{ .Values.dashboard.image.name }}:{{ .Values.dashboard.image.tag }}
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           ports:
             - name: http
-              containerPort: {{ .Values.dashboard.server.port }}
+              containerPort: {{ .Values.dashboard.service.http.containerPort }}
               protocol: TCP
           volumeMounts:
             - name: application-config
@@ -64,4 +64,4 @@ spec:
       volumes:
         - name: application-config
           configMap:
-            name: {{ include "dashboard.fullname" . }}-appconfig
+            name: {{ include "common.configmapname.dashboard" . }}-appconfig