aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-27 11:07:42 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-14 17:28:07 +0100
commit93a5b49185695a7960ada82f5899265b5bc2e504 (patch)
treeaa6e43614e023008d8ca24f16468d69ca765319d /kubernetes/policy
parent92abd28e06b8221e8ff3f0785c9702376010ad94 (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/policy')
-rwxr-xr-xkubernetes/policy/values.yaml32
1 files changed, 16 insertions, 16 deletions
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index a623c352fb..d09895484c 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -24,8 +24,7 @@ global:
config: &mariadbConfig
mysqlDatabase: policyadmin
service: &mariadbService
- name: policy-mariadb
- portName: mysql-policy
+ name: &policy-mariadb policy-mariadb
internalPort: 3306
#################################################################
@@ -35,15 +34,15 @@ secrets:
- uid: db-root-password
name: &dbRootPassSecretName '{{ include "common.release" . }}-policy-db-root-password'
type: password
- externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret")) .) (hasSuffix "policy-db-root-password" (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret"))}}'
- password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword") }}'
+ externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .) (hasSuffix "policy-db-root-password" (index .Values "mariadb-galera" "rootUser" "externalSecret"))}}'
+ password: '{{ (index .Values "mariadb-galera" "rootUser" "password") }}'
policy: generate
- uid: db-secret
name: &dbSecretName '{{ include "common.release" . }}-policy-db-secret'
type: basicAuth
- externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret")) .) (hasSuffix "policy-db-secret" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret"))}}'
- login: '{{ index .Values "mariadb-galera" "config" "userName" }}'
- password: '{{ index .Values "mariadb-galera" "config" "userPassword" }}'
+ externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "db" "externalSecret")) .) (hasSuffix "policy-db-secret" (index .Values "mariadb-galera" "db" "externalSecret"))}}'
+ login: '{{ index .Values "mariadb-galera" "db" "user" }}'
+ password: '{{ index .Values "mariadb-galera" "db" "password" }}'
passwordPolicy: generate
db: &dbSecretsHook
@@ -107,21 +106,22 @@ readiness:
mariadb-galera:
# mariadb-galera.config and global.mariadb.config must be equals
- config:
- <<: *mariadbConfig
- userName: policy_user
- mariadbRootPasswordExternalSecret: *dbRootPassSecretName
- userCredentialsExternalSecret: *dbSecretName
- nameOverride: policy-mariadb
+ db:
+ user: policy_user
+ # password:
+ externalSecret: *dbSecretName
+ name: &mysqlDbName policyadmin
+ rootUser:
+ externalSecret: *dbRootPassSecretName
+ nameOverride: *policy-mariadb
# mariadb-galera.service and global.mariadb.service must be equals
service: *mariadbService
replicaCount: 1
persistence:
enabled: true
mountSubPath: policy/maria/data
- externalConfig: |-
- [mysqld]
- lower_case_table_names = 1
+ serviceAccount:
+ nameOverride: *policy-mariadb
# Resource Limit flavor -By Default using small
# Segregation for Different environment (small, large, or unlimited)