From 93a5b49185695a7960ada82f5899265b5bc2e504 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 27 Nov 2020 11:07:42 +0100 Subject: [COMMON][MARIADB] Upgrade Mariadb DB galera version Mariadb DB Galera containers version is outdated and unmaintained. We need them to move to a new image provider. As new image provider is not compatible with our old templates, we also update the templates (by reworking bitnami mariadb-galera chart). An update of global mariadb image is also done in order to match mariadb galera version. Issue-ID: OOM-1720 Signed-off-by: Sylvain Desbureaux Change-Id: Ib9976227759e90022183d4f37fc655143be4d6ac --- .../appc/components/appc-ansible-server/values.yaml | 2 +- kubernetes/appc/values.yaml | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'kubernetes/appc') diff --git a/kubernetes/appc/components/appc-ansible-server/values.yaml b/kubernetes/appc/components/appc-ansible-server/values.yaml index 1588bc52d6..076cf6b5f2 100644 --- a/kubernetes/appc/components/appc-ansible-server/values.yaml +++ b/kubernetes/appc/components/appc-ansible-server/values.yaml @@ -36,7 +36,7 @@ config: ansibleUid: 100 ansibleGid: 101 appcChartName: appc - mysqlServiceName: appc-dbhost + mysqlServiceName: appc-db configDir: /opt/onap/ccsdk # default number of instances diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 92c9985c35..cc56bb4859 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -82,8 +82,8 @@ config: odlGid: 101 ansibleServiceName: appc-ansible-server ansiblePort: 8000 - mariadbGaleraSVCName: appc-dbhost - mariadbGaleraContName: appc-db + mariadbGaleraSVCName: &appc-db appc-db + mariadbGaleraContName: *appc-db enableAAF: true enableClustering: false configDir: /opt/onap/appc/data/properties @@ -110,24 +110,25 @@ appc-ansible-server: name: appc-ansible-server internalPort: 8000 config: - mysqlServiceName: appc-dbhost + mysqlServiceName: *appc-db appc-cdt: enabled: true mariadb-galera: - nameOverride: appc-db - config: - mariadbRootPasswordExternalSecret: '{{ include "common.release" . }}-appc-db-root-pass' + nameOverride: *appc-db + rootUser: + externalSecret: '{{ include "common.release" . }}-appc-db-root-pass' service: - name: appc-dbhost - portName: appc-dbhost + name: *appc-db nfsprovisionerPrefix: appc sdnctlPrefix: appc persistence: mountSubPath: appc/data enabled: true disableNfsProvisioner: true + serviceAccount: + nameOverride: *appc-db dgbuilder: nameOverride: appc-dgbuilder @@ -137,8 +138,8 @@ dgbuilder: db: rootPasswordExternalSecret: '{{ include "common.release" . }}-appc-db-root-pass' userCredentialsExternalSecret: '{{ include "common.release" . }}-sdncdb-user-creds' - dbPodName: appc-db - dbServiceName: appc-dbhost + dbPodName: *appc-db + dbServiceName: *appc-db service: name: appc-dgbuilder -- cgit 1.2.3-korg