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=446bb9e0441530f37e2fc5dc425683c6f17661a5;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=08360458b950d5bc7c19e6016c72942105a8cd0a;hpb=431ae3c7eab922223215b52f2a347029eb95335b;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 08360458..446bb9e0 100644
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
@@ -19,9 +19,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.deploymentname.e2mgr" .}}
-  namespace: {{ include "common.namespace" . }}
+  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 }}
@@ -29,38 +29,50 @@ spec:
   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:
+      {{- if .Values.e2mgr.annotations }}
+      annotations:
+        {{- .Values.e2mgr.annotations | nindent 8 -}}
+      {{ end }}
       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" . }}
+        - 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.e2mgr.env.RMR_RTG_SVC }}"
+          - mountPath: /opt/E2Manager/resources/configuration.yaml
+            name: local-configuration-file
+            subPath: configuration.yaml
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.configmapname.e2mgr" . }}-env
           ports:
-            - name: {{ .Values.e2mgr.service.http.name }}
-              containerPort: {{ .Values.e2mgr.service.http.port }}
-            - name: {{ .Values.e2mgr.service.nano.name }}
-              containerPort: {{ .Values.e2mgr.service.nano.port }}
+            - name: "http"
+              containerPort: {{ include "common.serviceport.e2mgr.http" . }}
+            - name: "rmrroute"
+              containerPort: {{ include "common.serviceport.e2mgr.rmr.route" . }}
+            - name: "rmrdata"
+              containerPort: {{ include "common.serviceport.e2mgr.rmr.data" . }}
           stdin: true
           tty: true
           securityContext:
-            privileged: true
+            privileged: {{ .Values.e2mgr.privilegedmode}}
       volumes:
         - name: local-router-file
           configMap:
             name: {{ include "common.configmapname.e2mgr" . }}-router-configmap
+        - name: local-configuration-file
+          configMap:
+            name: {{ include "common.configmapname.e2mgr" . }}-configuration-configmap