diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-27 11:07:42 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-14 17:28:07 +0100 |
| commit | 93a5b49185695a7960ada82f5899265b5bc2e504 (patch) | |
| tree | aa6e43614e023008d8ca24f16468d69ca765319d /kubernetes/nbi | |
| parent | 92abd28e06b8221e8ff3f0785c9702376010ad94 (diff) | |
[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 <sylvain.desbureaux@orange.com>
Change-Id: Ib9976227759e90022183d4f37fc655143be4d6ac
Diffstat (limited to 'kubernetes/nbi')
| -rw-r--r-- | kubernetes/nbi/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/nbi/values.yaml | 22 |
2 files changed, 11 insertions, 13 deletions
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml index 4be444ad1b..d5f209e94a 100644 --- a/kubernetes/nbi/templates/deployment.yaml +++ b/kubernetes/nbi/templates/deployment.yaml @@ -83,7 +83,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: SPRING_DATASOURCE_URL - value: jdbc:mariadb://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }} + value: jdbc:mariadb://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "db" "name" }} - name: SPRING_DATASOURCE_USERNAME {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "nbi-db-secret" "key" "login") | indent 14 }} - name: SPRING_DATASOURCE_PASSWORD diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml index 61d7680824..53260cb21c 100644 --- a/kubernetes/nbi/values.yaml +++ b/kubernetes/nbi/values.yaml @@ -55,7 +55,7 @@ aafConfig: ################################################################# secrets: - uid: nbi-db-secret - name: '{{ include "common.release" . }}-nbi-db-secret' + name: &dbUserSecretName '{{ include "common.release" . }}-nbi-db-secret' type: basicAuth externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}' login: '{{ .Values.config.db.userName }}' @@ -89,23 +89,21 @@ config: # userCredentialsExternalSecret: some-secret mariadb-galera: - # '&mariadbConfig' means we "store" the values for later use in the file - # with '*mariadbConfig' pointer. - config: &mariadbConfig - userCredentialsExternalSecret: '{{ include "common.release" . }}-nbi-db-secret' - mysqlDatabase: nbi - nameOverride: nbi-galera - service: - name: nbi-galera - portName: nbi-galera - internalPort: 3306 + db: + externalSecret: *dbUserSecretName + name: &mysqlDbName nbi + nameOverride: &nbi-galera nbi-galera replicaCount: 1 persistence: enabled: true mountSubPath: nbi/maria/data + serviceAccount: + nameOverride: *nbi-galera mariadb-init: - config: *mariadbConfig + config: + userCredentialsExternalSecret: *dbUserSecretName + mysqlDatabase: *mysqlDbName nameOverride: nbi-config mongo: |