Merge "[COMMON] Add missing .helmignore files and "components/" entries"

[oom.git] / kubernetes / oof / components / oof-cmso / components / oof-cmso-service / templates / deployment.yaml

diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
index 3fd0112..d82040b 100644 (file)
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         - /app/ready.py
         args:
         - --container-name
-        - {{ .Values.config.db.container }}
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -77,9 +77,9 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: {{ .Values.config.db.host }}.{{.Release.Namespace}}
+          value: {{ include "common.mariadbService" . }}.{{.Release.Namespace}}
         - name: DB_PORT
-          value: {{ .Values.config.db.port | quote}}
+          value: {{ include "common.mariadbPort" . | quote}}
         - name: DB_USERNAME
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "login") | indent 10}}
         - name: DB_SCHEMA
@@ -113,9 +113,9 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: {{ .Values.config.db.host }}.{{.Release.Namespace}}
+          value: {{ include "common.mariadbService" . }}.{{.Release.Namespace}}
         - name: DB_PORT
-          value: {{ .Values.config.db.port | quote}}
+          value: {{ include "common.mariadbPort" . | quote}}
         - name: DB_USERNAME
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "login") | indent 10}}
         - name: DB_SCHEMA