summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-02-07 16:00:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-07 16:00:12 +0000
commit7247de21ba24468145defa6e03b799e12d24eec7 (patch)
treeaa2667dbea7228dc4d1a97bd8e4821fbef7ed5b8
parent069a2274c2c108c201872e612a4dad22be397c98 (diff)
parent0f811c8387f01dcd0f348024ba1c8fb8e99961a8 (diff)
Merge "[OOF] fix secret names for mariadb-galera"
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml8
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml10
2 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml
index 0e6b4c8791..d7a0ea5ca3 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml
@@ -60,8 +60,8 @@ spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: db-root-password
+ name: {{ include "common.release" . }}-cmso-db-db-root-password
+ key: password
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
@@ -84,8 +84,8 @@ spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: db-root-password
+ name: {{ include "common.release" . }}-cmso-db-db-root-password
+ key: password
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
index e7b5eed924..385d61684f 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
@@ -60,8 +60,8 @@ spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: db-root-password
+ name: {{ include "common.release" . }}-cmso-db-db-root-password
+ key: password
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
@@ -90,7 +90,7 @@ spec:
- name: {{ include "common.fullname" . }}-config
mountPath: /share/etc/config
ports:
- - containerPort: 5000
+ - containerPort: 5000
resources:
{{ include "common.resources" . }}
- name: {{ include "common.name" . }}
@@ -108,8 +108,8 @@ spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ include "common.release" . }}-cmso-db
- key: user-password
+ name: {{ include "common.release" . }}-cmso-db-db-user-credentials
+ key: password
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE