From 4d3f36808a67349915c98fe3e035f3b67ffcdda1 Mon Sep 17 00:00:00 2001
From: rope252 <gareth.roper@est.tech>
Date: Wed, 2 Sep 2020 20:49:21 +0100
Subject: [SO-ETSI-NFVO] Add SO DB and NFVO DB Credentials to NFVO NS LCM Pod
 for DB Communication

All of the credentials added have been accessed using the common secrets template.
In order to avoid hardcoding passwords etc.

I have added 2 jdbcUrl's for accessing the NFVO DB and the CamundaBPMN DB. These will be needed for code going into the SO codebase.

This change should not have an effect on any other charts, as properties have only been added to ETSI NFVO Charts.

Issue-ID: SO-3159
Change-Id: Ic6e0002ce64b872ac0c44fa1f124304c392e6a8b
Signed-off-by: rope252 <gareth.roper@est.tech>
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---
 kubernetes/so/values.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'kubernetes/so/values.yaml')

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 47c82c3d86..e834d86078 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -26,7 +26,7 @@ global:
   mariadbGalera:
     nameOverride: mariadb-galera
     serviceName: mariadb-galera
-    servicePort: "3306"
+    servicePort: '3306'
     # mariadbRootPassword: secretpassword
     # rootPasswordExternalSecret: some secret
     #This flag allows SO to instantiate its own mariadb-galera cluster,
@@ -87,7 +87,7 @@ secrets:
     passwordPolicy: required
     annotations:
       helm.sh/hook: pre-upgrade,pre-install
-      helm.sh/hook-weight: "0"
+      helm.sh/hook-weight: '0'
       helm.sh/hook-delete-policy: before-hook-creation
   - uid: db-user-creds
     name: &dbUserCredsSecretName '{{ include "common.release" . }}-so-db-user-creds'
@@ -103,7 +103,7 @@ secrets:
     login: '{{ .Values.dbCreds.adminName }}'
     password: '{{ .Values.dbCreds.adminPassword }}'
     passwordPolicy: generate
-  - uid: "so-onap-certs"
+  - uid: 'so-onap-certs'
     name: &so-certs '{{ include "common.release" . }}-so-certs'
     externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
     type: generic
@@ -209,11 +209,11 @@ mariadb-galera:
 ingress:
   enabled: false
   service:
-    - baseaddr: "so.api"
-      name: "so"
+    - baseaddr: 'so.api'
+      name: 'so'
       port: 8080
   config:
-    ssl: "none"
+    ssl: 'none'
 
 mso:
   adapters:
@@ -248,6 +248,8 @@ so-catalog-db-adapter:
 
 so-etsi-nfvo-ns-lcm:
   enabled: true
+  db:
+    <<: *dbSecrets
 
 so-monitoring:
   enabled: true
-- 
cgit 1.2.3-korg