Merge "Update a1 helm chart from r2 to amber/r3"

[it/dep.git] / ric-platform / 50-RIC-Platform / helm / a1mediator / templates / deployment.yaml

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
index dbd8857..4430483 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
@@ -34,6 +34,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.a1mediator.annotations }}
+      annotations:
+        {{- .Values.a1mediator.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
         release: {{ .Release.Name }}
@@ -44,12 +48,6 @@ spec:
       containers:
         - name: {{ include "common.containername.a1mediator" . }}
           volumeMounts:
-          - name: a1conf
-            mountPath: /opt/ricmanifest.json
-            subPath: ricmanifest.json
-          - name: a1conf
-            mountPath: /opt/rmr_string_int_mapping.txt
-            subPath: rmr_string_int_mapping.txt
           - name: a1conf
             mountPath: /opt/route/local.rt
             subPath: local.rt
@@ -60,21 +58,21 @@ spec:
           imagePullPolicy: {{ include "common.pullPolicy" . }}
           ports:
             - name: http
-              containerPort: {{ .Values.a1mediator.service.http.containerPort }}
+              containerPort: {{ include "common.serviceport.a1mediator.http" . }}
               protocol: TCP
             - name: rmrroute
-              containerPort: {{ .Values.a1mediator.service.rmr.route.port }}
+              containerPort: {{ include "common.serviceport.a1mediator.rmr.route" . }}
               protocol: TCP
             - name: rmrdata
-              containerPort: {{ .Values.a1mediator.service.rmr.data.port }}
+              containerPort: {{ include "common.serviceport.a1mediator.rmr.data" . }}
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /ui
+              path: /a1-p/healthcheck
               port: http
           readinessProbe:
             httpGet:
-              path: /ui
+              path: /a1-p/healthcheck
               port: http
       volumes:
         - name: "a1conf"