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/common/network-name-gen | |
| 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/common/network-name-gen')
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/values.yaml | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index 16d93c6ed3..8ca5374bbd 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -72,7 +72,7 @@ spec: - name: NENG_DB_PASS {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "neng-db-secret" "key" "password") | indent 10}} - name: NENG_DB_URL - value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }} + value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "db" "name" }} - name: POL_CLIENT_AUTH value: "{{ .Values.config.polClientAuth }}" - name: POL_BASIC_AUTH_USER diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index d38d6e25cd..d32c04511b 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -36,9 +36,9 @@ global: ################################################################# secrets: - uid: neng-db-secret - name: '{{ include "common.release" . }}-neng-db-secret' + name: &dbUserSecretName '{{ include "common.release" . }}-neng-db-secret' type: basicAuth - externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}' + externalSecret: '{{ tpl (default "" .Values.config.db.externalSecret) . }}' login: '{{ .Values.config.db.userName }}' password: '{{ .Values.config.db.userPassword }}' - uid: pol-basic-auth-secret @@ -50,9 +50,11 @@ secrets: # sub-chart config mariadb-galera: - config: &mariadbConfig - userCredentialsExternalSecret: '{{ include "common.release" . }}-neng-db-secret' - mysqlDatabase: nengdb + db: + user: sdnctl + # password: + externalSecret: *dbUserSecretName + name: &mysqlDbName nengdb nameOverride: nengdb service: name: nengdb @@ -63,7 +65,9 @@ mariadb-galera: mountSubPath: network-name-gen/data mariadb-init: - config: *mariadbConfig + config: + userCredentialsExternalSecret: *dbUserSecretName + mysqlDatabase: *mysqlDbName nameOverride: nengdb-init ################################################################# |