X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Frtmgr%2Ftemplates%2Fdeployment.yaml;h=592309ebf1a3510a7daf5c2e6eeb027f46a4bad8;hb=a9ae10bcbf57300b65fb0f39090034554c59270c;hp=afeff191e5b0e802720c44c6aa52de93b2828b85;hpb=431ae3c7eab922223215b52f2a347029eb95335b;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
index afeff191..592309eb 100644
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
@@ -19,9 +19,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.deploymentname.rtmgr" . }}
-  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.rtmgr" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -29,37 +29,45 @@ spec:
   replicas: {{ .Values.rtmgr.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.rtmgr.annotations }}
+      annotations:
+        {{- .Values.rtmgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ .Chart.Name }}
+      hostname: {{ include "common.name.rtmgr" . }}
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
-        - name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        - name: {{ include "common.containername.rtmgr" . }}
           image: {{ include "common.repository" . }}/{{ .Values.rtmgr.image.name }}:{{ .Values.rtmgr.image.tag }}
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           command: ["/run_rtmgr.sh"]
-          env:
-            - name: XMURL
-              value: "http://ric-full-appmgr:8080/ric/v1/xapps"
-            - name: SOCKET
-              value: "tcp://0.0.0.0:4560"
-            - name: RTFILE
-              value: "/db/rt.json"
-            - name: NBI
-              value: "httpGetter"
-            - name: SBI
-              value: "nngpub"
-            - name: RPE
-              value: "rmr"
-            - name: SDL
-              value: "file"
+          #command: ["/bin/sh"]
+          #args: ["-c", "while true; do echo hello; sleep 10;done"]
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.configmapname.rtmgr" . }}-env
+          volumeMounts:
+            - mountPath: /cfg
+              name: rtmgrcfg
+              readOnly: true
           ports:
-            - name: {{ .Values.rtmgr.service.nano.name }}
-              containerPort: {{ .Values.rtmgr.service.nano.port }}
+            - name: "rmrroute"
+              containerPort: {{ include "common.serviceport.rtmgr.rmr.route" . }}
+            - name: "rmrdata"
+              containerPort: {{ include "common.serviceport.rtmgr.rmr.data" . }}
+      volumes:
+        - name: "rtmgrcfg"
+          configMap:
+            name: {{ include "common.configmapname.rtmgr" . }}-rtmgrcfg
+            items:
+              - key: rtmgrcfg
+                path: rtmgr-config.json
+                mode: 0644