From a74326fc152d115af5ffa1eae61d592a9e3ca74f Mon Sep 17 00:00:00 2001 From: Mahmoud Abdelhamid Date: Fri, 24 Sep 2021 17:28:28 +0200 Subject: [VFC] Use common mariadb-galera instance Have following updates for VFC: - Add section under .Values.global for shared mariadb instance default info with a condition to instantiate local instance. - Update the related section of Mariadb-galera under .Values - Add condition under requirments.yaml to install local mariadb instance * Note: Since Components initiate their own DBs and Users, there is no need to initiate the common mariadb-galera with mariadb-init, instead root password will injected to components to be able to create the DBs. Have following updates for nslcm, vnflcm, vnfmgr and vnfres: - Update .Values to accommodate for the new changes in parent .Values file. - Update root secret with the condition of having local mariadb or using the common. - Update deployments to include the definitions of mariadb service and port defined in (common/_mariadb.tpl) Issue-ID: OOM-2840 Signed-off-by: Mahmoud Abdelhamid Change-Id: Ia6a8e91ca3978928c4bf336a3a86ab1c6d64597a --- kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes/vfc/components/vfc-nslcm/templates') diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml index 40ca646e0f..17d8cc263e 100644 --- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml +++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml @@ -42,7 +42,7 @@ spec: - /app/ready.py args: - --container-name - - {{ .Values.config.mariadbService }} + - '{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}' env: - name: NAMESPACE valueFrom: @@ -83,7 +83,7 @@ spec: - name: SSL_ENABLED value: "{{ .Values.global.config.ssl_enabled }}" - name: MYSQL_ADDR - value: "{{ .Values.config.mariadbService }}:{{ .Values.config.mariadbPort }}" + value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}' - name: MYSQL_ROOT_USER value: "{{ .Values.global.config.mariadb_admin }}" - name: MYSQL_ROOT_PASSWORD -- cgit 1.2.3-korg