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=a4848137bf502d790b7723a01e5cff6b631548b0;hb=3803859c341dc62bdcd79ba94be585592a94672b;hp=dbcd31529dd828de61423a4c91a53bc8c0d5ce9d;hpb=431ae3c7eab922223215b52f2a347029eb95335b;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 dbcd3152..a4848137 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml @@ -19,9 +19,9 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "common.deploymentname.appmgr" . }} - 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.appmgr" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -29,24 +29,30 @@ spec: 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 }} 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" . }} imagePullSecrets: - name: {{ include "common.repositoryCred" . }} containers: - - name: {{ include "common.namespace" . }}-{{ include "common.name" . }} + - 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.appmgr.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 @@ -58,7 +64,7 @@ spec: mountPath: {{ .Values.appmgr.appcertpath }} envFrom: - configMapRef: - name: {{ include "common.configmapname.appmgr" . }}-appenv + name: {{ include "common.configmapname.appmgr" . }}-env livenessProbe: #exec: # command: