X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fdbaas%2Ftemplates%2Fdeployment.yaml;h=7095b18411b4350e43d8ba2667a3185bd494f417;hb=bb6097c9e2fa2918028892b2c5e675841029bee9;hp=d4213b2e7b713189974d738528782cf7ed75847c;hpb=948cb92657906b0c6ede9e1f82a56b95521fe0b4;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
index d4213b2e..7095b184 100644
--- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
@@ -19,9 +19,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.deploymentname.dbaas" . }}
-  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.dbaas" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -29,12 +29,16 @@ spec:
   replicas: {{ .Values.dbaas.backend.replicas }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.dbaas.annotations }}
+      annotations:
+        {{- .Values.dbaas.annotations | nindent 8 -}}
+      {{ end }}
       labels:
-        app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
         release: {{ .Release.Name }}
     spec:
       imagePullSecrets:
@@ -44,8 +48,8 @@ spec:
       - image: {{ include "common.repository" . }}/{{ .Values.dbaas.backend.image.name }}:{{ .Values.dbaas.backend.image.tag }}
         imagePullPolicy: {{ include "common.pullPolicy" . }}
         ports:
-        - containerPort: {{ .Values.dbaas.backend.containerPort }}
+        - containerPort: {{ include "common.serviceport.dbaas.tcp" . }}
           name: sql
           protocol: TCP
-        name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        name: {{ include "common.containername.dbaas" . }}
       restartPolicy: Always