Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add A1 Policy Management Service helm charts"
[oom.git]
/
kubernetes
/
common
/
mariadb-init
/
values.yaml
diff --git
a/kubernetes/common/mariadb-init/values.yaml
b/kubernetes/common/mariadb-init/values.yaml
index
cac6f79
..
dd5d208
100644
(file)
--- a/
kubernetes/common/mariadb-init/values.yaml
+++ b/
kubernetes/common/mariadb-init/values.yaml
@@
-17,8
+17,7
@@
#################################################################
global:
repository: nexus3.onap.org:10001
#################################################################
global:
repository: nexus3.onap.org:10001
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.2
+ readinessImage: onap/oom/readiness:3.0.1
mariadbGalera:
nameOverride: mariadb-galera
servicePort: 3306
mariadbGalera:
nameOverride: mariadb-galera
servicePort: 3306
@@
-33,11
+32,11
@@
global:
secrets:
- uid: root-password
type: password
secrets:
- uid: root-password
type: password
- externalSecret: '{{ tpl (
default (include "mariadbInit.mariadbClusterSecret" .) .Values.global.mariadbGalera.userRootSecret
) . }}'
- password: '{{ tpl (
default "" .global.mariadbGalera.userRootPassword
) . }}'
+ externalSecret: '{{ tpl (
ternary (default "" .Values.mariadbGalera.userRootSecret) (default (include "mariadbInit.mariadbClusterSecret" .) .Values.global.mariadbGalera.userRootSecret) (not (empty (default "" .Values.mariadbGalera.serviceName)))
) . }}'
+ password: '{{ tpl (
ternary (default "" .Values.mariadbGalera.userRootPassword) (default "" .Values.global.mariadbGalera.userRootPassword) (not (empty (default "" .Values.mariadbGalera.serviceName)))
) . }}'
- uid: '{{ .Values.config.mysqlDatabase }}'
type: basicAuth
- uid: '{{ .Values.config.mysqlDatabase }}'
type: basicAuth
- externalSecret: '{{ tpl (default "" .Values.config.
mysql
ExternalSecret) . }}'
+ externalSecret: '{{ tpl (default "" .Values.config.
userCredentials
ExternalSecret) . }}'
login: '{{ .Values.config.userName }}'
password: '{{ .Values.config.userPassword }}'
passwordPolicy: required
login: '{{ .Values.config.userName }}'
password: '{{ .Values.config.userPassword }}'
passwordPolicy: required
@@
-52,11
+51,20
@@
pullPolicy: IfNotPresent
# Set it if you want to change the name of the different components
# nameOverride:
# Set it if you want to change the name of the different components
# nameOverride:
+mariadbGalera: {}
+# serviceName: some-name
+# containerName: some-name
+# servicePort: 3306
+# userRootPassword: some-password
+# userRootSecret: some-secret-name
+# userRootSecretKey: password
+
+
config:
userPassword: Ci@shsOd3pky1Vji
userName: u5WZ1GMSIS1wHZF
# set this value if you would like to use external secret instead of providing a password
config:
userPassword: Ci@shsOd3pky1Vji
userName: u5WZ1GMSIS1wHZF
# set this value if you would like to use external secret instead of providing a password
- #
mysql
Externalsecret: some-secret-name
+ #
userCredentials
Externalsecret: some-secret-name
mysqlDatabase: ynsaUCru6mUNwGal
mysqlAdditionalDatabases: {}
# add addtional dabases
mysqlDatabase: ynsaUCru6mUNwGal
mysqlAdditionalDatabases: {}
# add addtional dabases