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=b425365a5b8807265d23e4dc79cabb6bce2e7a67;hb=7f1e409379856025977fc8a6ea04ddb215f21a13;hp=52e53398bedcd1f1923a159948dafd8b43b4b501;hpb=fc4f466d6a05466097cdcfff1990e732c3b288b0;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..b425365a 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -26,7 +26,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.appmgr.replicaCount }}
   selector:
     matchLabels:
       app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
@@ -41,22 +41,22 @@ spec:
     spec:
       hostname: {{ .Chart.Name }}
       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 }}
+          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.containerPort }}
               protocol: TCP
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.appconfigpath }}
+              mountPath: {{ .Values.appmgr.appconfigpath }}
             - 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
@@ -73,25 +73,10 @@ 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: