X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fe2mgr%2Ftemplates%2Fdeployment.yaml;h=330f12361b2fe0f25b3f2c68db5f56c9027e8e4b;hb=0309475769b27702c8c886411222882da8b519b1;hp=b4561e83ccb2f0d0986b6d864b676a5abd69da61;hpb=033ab424056c2de6bdbc22479e961aeebbaddd37;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
index b4561e83..330f1236 100644
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
@@ -18,44 +18,46 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "e2mgr.fullname" .}}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.deploymentname.e2mgr" .}}
+  namespace: {{ include "common.namespace.platform" . }}
   labels:
-    app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.e2mgr.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ .Chart.Name }} 
+      hostname: {{ include "common.name.e2mgr" . }} 
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
-        - name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+        - name: {{ include "common.containername.e2mgr" . }}
+          image: {{ include "common.repository" . }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }}
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           volumeMounts:
           - mountPath: /opt/E2Manager/router.txt
             name: local-router-file
             subPath: router.txt
-          env:
-            - name: RMR_RTG_SVC
-              value: "{{ .Values.env.RMR_RTG_SVC }}"
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.configmapname.e2mgr" . }}-env
           ports:
-            - name: {{ .Values.service.http.name }}
-              containerPort: {{ .Values.service.http.port }}
-            - name: {{ .Values.service.nano.name }}
-              containerPort: {{ .Values.service.nano.port }}
+            - name: "http"
+              containerPort: {{ .Values.e2mgr.service.http.containerPort }}
+            - name: "rmrroute"
+              containerPort: {{ .Values.e2mgr.service.rmr.route.port }}
+            - name: "rmrdata"
+              containerPort: {{ .Values.e2mgr.service.rmr.data.port }}
           stdin: true
           tty: true
           securityContext:
@@ -63,4 +65,4 @@ spec:
       volumes:
         - name: local-router-file
           configMap:
-            name: {{ include "e2mgr.fullname" . }}-router-configmap
+            name: {{ include "common.configmapname.e2mgr" . }}-router-configmap