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=1589b24b9331389c174dde26e2aa032e92147764;hpb=033ab424056c2de6bdbc22479e961aeebbaddd37;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 1589b24b..7095b184 100644
--- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
@@ -18,32 +18,38 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dbaas.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.deploymentname.dbaas" . }}
+  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 }}
 spec:
-  replicas: {{ .Values.backend.replicas }}
+  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:
        - name: {{ include "common.repositoryCred" . }}
-      terminationGracePeriodSeconds: {{ .Values.backend.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.dbaas.backend.terminationGracePeriodSeconds }}
       containers:
-      - image: {{ include "common.repository" . }}/{{ .Values.backend.image.name }}:{{ .Values.backend.image.tag }}
+      - image: {{ include "common.repository" . }}/{{ .Values.dbaas.backend.image.name }}:{{ .Values.dbaas.backend.image.tag }}
         imagePullPolicy: {{ include "common.pullPolicy" . }}
         ports:
-        - containerPort: {{ .Values.backend.targetPort }}
-        name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+        - containerPort: {{ include "common.serviceport.dbaas.tcp" . }}
+          name: sql
+          protocol: TCP
+        name: {{ include "common.containername.dbaas" . }}
       restartPolicy: Always