[OOF] fix secret names for mariadb-galera

It looks like AAF issues masked my real mistakes of letting
some of oof services failing because of bad secret names.

Let's fix that quickly by just setting them to the corrent names
temporarly as later oof will be ported to use common secret template
anyway.

Issue-ID: OOM-2053
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I9de1804dbd5399df25a3ef98354f41d39d073bf7

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 0e6b4c8..d7a0ea5 100644 (file)
--- 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 e7b5eed..385d616 100644 (file)
--- 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