X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fappmgr%2Ftemplates%2Fdeployment.yaml;h=1ea190b880fa6a8effd61b77be60b2bf68952870;hb=fb1483d09cc5deba80360184fb4f91b526f57c53;hp=52e53398bedcd1f1923a159948dafd8b43b4b501;hpb=033ab424056c2de6bdbc22479e961aeebbaddd37;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
index 52e53398..1ea190b8 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -18,48 +18,54 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "appmgr.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.deploymentname.appmgr" . }}
+  namespace: {{ include "common.namespace.platform" . }}
   labels:
-    app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.appmgr.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
       release: {{ .Release.Name }}
-      #app.kubernetes.io/name: {{ include "appmgr.name" . }}
-      #app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ .Chart.Name }}
+      hostname: {{ include "common.name.appmgr" . }}
+      serviceAccountName: {{ include "common.serviceaccountname.appmgr" . }}
       imagePullSecrets:
-        - name: {{ .Values.image.repositoryCred }}
+        - 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.appmgr" . }}
+          image: {{ include "common.repository" . }}/{{ .Values.appmgr.image.name }}:{{ .Values.appmgr.image.tag }}
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           ports:
             - name: http
-              containerPort: {{ .Values.containerPort }}
+              containerPort: {{ .Values.appmgr.service.http.containerPort }}
+              protocol: TCP
+            - name: rmrroute
+              containerPort: {{ .Values.appmgr.service.rmr.route.port }}
+              protocol: TCP
+            - name: rmrdata
+              containerPort: {{ .Values.appmgr.service.rmr.data.port }}
               protocol: TCP
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.appconfigpath }}
+              mountPath: {{ .Values.appmgr.appconfigpath }}/appmgr.yaml
+              subPath: appmgr.yaml
             - name: secret-volume
-              mountPath: {{ .Values.appsecretpath }}
+              mountPath: {{ .Values.appmgr.appsecretpath }}
             - name: cert-volume
-              mountPath: {{ .Values.appcertpath }}
+              mountPath: {{ .Values.appmgr.appcertpath }}
           envFrom:
             - configMapRef:
-                name: {{ include "appmgr.fullname" . }}-appenv
+                name: {{ include "common.configmapname.appmgr" . }}-env
           livenessProbe:
             #exec:
             #  command:
@@ -73,29 +79,14 @@ spec:
           #    path: /
           #    port: http
           restartPolicy: Always
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
           securityContext:
             # ubuntu
             #runAsUser: 1000
             #allowPrivilegeEscalation: false
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-
       volumes:
         - name: config-volume
           configMap:
-            name: {{ include "appmgr.fullname" . }}-appconfig
+            name: {{ include "common.configmapname.appmgr" . }}-appconfig
         - name: secret-volume
           secret:
             secretName: {{ include "common.helmrepositorycred" . }}