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 "[SDNC] Check existance of DB user before creation"
[oom.git]
/
kubernetes
/
oof
/
components
/
oof-cmso
/
values.yaml
diff --git
a/kubernetes/oof/components/oof-cmso/values.yaml
b/kubernetes/oof/components/oof-cmso/values.yaml
index
e83e2de
..
c46fd0a
100644
(file)
--- a/
kubernetes/oof/components/oof-cmso/values.yaml
+++ b/
kubernetes/oof/components/oof-cmso/values.yaml
@@
-36,43
+36,37
@@
secrets:
login: '{{ .Values.config.db.optimizer.userName }}'
password: '{{ .Values.config.db.optimizer.userPassword }}'
passwordPolicy: generate
login: '{{ .Values.config.db.optimizer.userName }}'
password: '{{ .Values.config.db.optimizer.userPassword }}'
passwordPolicy: generate
+ - uid: cmso-aaf-creds
+ name: &aafCreds '{{ include "common.release" . }}-cmso-aaf-creds'
+ type: basicAuth
+ login: '{{ .Values.config.aaf.user }}'
+ password: '{{ .Values.config.aaf.password }}'
mariadb-galera:
replicaCount: 1
mariadb-galera:
replicaCount: 1
- nameOverride: &containerName cmso-db
- service:
- type: ClusterIP
- name: &serviceName oof-cmso-dbhost
- portName: cmso-dbhost
+ nameOverride: &dbName cmso-db
nfsprovisionerPrefix: cmso
sdnctlPrefix: cmso
persistence:
mountSubPath: cmso/data
enabled: true
disableNfsProvisioner: true
nfsprovisionerPrefix: cmso
sdnctlPrefix: cmso
persistence:
mountSubPath: cmso/data
enabled: true
disableNfsProvisioner: true
- config:
- mariadbRootPasswordExternalSecret: *rootPassword
- # userCredentialsExternalSecret: *dbCreds
- # mysqlDatabase: cmso
- externalConfig: |
- [mysqld]
- lower_case_table_names = 1
+ rootUser:
+ externalSecret: *rootPassword
+ serviceAccount:
+ nameOverride: *dbName
global:
commonConfigPrefix: "oof-cmso"
truststoreFile: "truststoreONAPall.jks"
keystoreFile: "org.onap.oof.jks"
global:
commonConfigPrefix: "oof-cmso"
truststoreFile: "truststoreONAPall.jks"
keystoreFile: "org.onap.oof.jks"
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
truststorePassword:
authentication: aaf-auth
truststorePassword:
authentication: aaf-auth
- busyBoxImage: busybox:1.30
- busyBoxRepository: docker.io
mariadb-init:
mariadbGalera:
mariadb-init:
mariadbGalera:
- containerName: *
container
Name
- serviceName: *
service
Name
+ containerName: *
db
Name
+ serviceName: *
db
Name
servicePort: 3306
userRootSecret: *rootPassword
config:
servicePort: 3306
userRootSecret: *rootPassword
config:
@@
-86,6
+80,9
@@
mariadb-init:
flavor: small
config:
flavor: small
config:
+ aaf:
+ user: oof@oof.onap.org
+ password: demo123456!
log:
logstashServiceName: log-ls
logstashPort: 5044
log:
logstashServiceName: log-ls
logstashPort: 5044
@@
-123,9
+120,11
@@
oof-cmso-service:
config:
db:
userCredentialsExternalSecret: *serviceDbCreds
config:
db:
userCredentialsExternalSecret: *serviceDbCreds
- host:
oof-cmso-dbhost
- container:
cmso-db
+ host:
*dbName
+ container:
*dbName
mysqlDatabase: cmso
mysqlDatabase: cmso
+ aaf:
+ userCredentialsExternalSecret: *aafCreds
oof-cmso-optimizer:
enabled: true
oof-cmso-optimizer:
enabled: true
@@
-136,9
+135,11
@@
oof-cmso-optimizer:
enabled: true
db:
userCredentialsExternalSecret: *optimizerDbCreds
enabled: true
db:
userCredentialsExternalSecret: *optimizerDbCreds
- host:
oof-cmso-dbhost
- container:
cmso-db
+ host:
*dbName
+ container:
*dbName
mysqlDatabase: optimizer
mysqlDatabase: optimizer
+ aaf:
+ userCredentialsExternalSecret: *aafCreds
oof-cmso-topology:
enabled: true
oof-cmso-topology:
enabled: true