X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fe2term%2Ftemplates%2Fdeployment.yaml;h=03d6603556cf75d5f8d4baa961da38dc654c985c;hb=debb34e08e99f3bf5c0348bb1d9731bee7e204aa;hp=82b1b7282efa7f88ac9b83faa8e40c0ef9381acc;hpb=ee1b045f7813a1caa70e00951ecfe73a99d43590;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
index 82b1b728..03d66035 100644
--- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
@@ -18,10 +18,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "e2term.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.deploymentname.e2term" . }}
+  namespace: {{ include "common.namespace.platform" . }}
   labels:
-    app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -29,44 +29,44 @@ spec:
   replicas: {{ .Values.e2term.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.e2term.annotations }}
+      annotations:
+        {{- .Values.e2term.annotations | nindent 8 -}}
+      {{ end }}
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ .Chart.Name }}
-      hostNetwork: true
+      hostname: {{ include "common.name.e2term" . }}
+      hostNetwork: {{ .Values.e2term.hostnetworkmode }}
       dnsPolicy: ClusterFirstWithHostNet
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
-        - name: {{ .Chart.Name }}
+        - name: {{ include "common.containername.e2term" . }}
           image: {{ include "common.repository" . }}/{{ .Values.e2term.image.name }}:{{ .Values.e2term.image.tag }}
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           volumeMounts:
           - mountPath: /opt/e2/router.txt
             name: local-router-file
             subPath: router.txt
-          env:
-            - name: sctp
-              value: "5577"
-            - name: nano
-              value: "{{ .Values.e2term.service.nano.port }}"
-            - name: print
-              value: "{{ .Values.e2term.env.print }}"
-            - name: RMR_RTG_SVC
-              value: "{{ .Values.e2term.env.RMR_RTG_SVC }}"
+          envFrom:
+            - configMapRef:
+                name: {{ include "common.configmapname.e2term" . }}-env
           ports:
-            - name: {{ .Values.e2term.service.nano.name }}
-              containerPort: {{ .Values.e2term.service.nano.port }}
+            - name: "rmrroute"
+              containerPort: {{ include "common.serviceport.e2term.rmr.route" . }}
+            - name: "rmrdata"
+              containerPort: {{ include "common.serviceport.e2term.rmr.data" . }}
           stdin: true
           tty: true
           securityContext:
-            privileged: true
+            privileged: {{ .Values.e2term.privilegedmode }}
       volumes:
         - name: local-router-file
           configMap:
-            name: {{ include "e2term.fullname" . }}-router-configmap
+            name: {{ include "common.configmapname.e2term" . }}-router-configmap