Rework CDS chart

- use shared DB
- remove unused properties

Change-Id: I1b45f4046180167d47aa1a8db6f34a118ae64209
Issue-ID: OOM-1743
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

13 files changed, 53 insertions, 129 deletions

diff --git a/kubernetes/cds/charts/blueprints-processor/requirements.yaml b/kubernetes/cds/charts/blueprints-processor/requirements.yaml
index 1d06a389a8..9f92507a99 100755
--- a/kubernetes/cds/charts/blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/charts/blueprints-processor/requirements.yaml
@@ -13,9 +13,6 @@
 # limitations under the License.
 
 dependencies:
-  - name: mariadb-galera
-    version: ~4.x-0
-    repository: file://../mariadb-galera/
   - name: common
     version: ~4.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/blueprints-processor/resources/config/application.properties
index 9d1c957b8f..c25176f971 100755
--- a/kubernetes/cds/charts/blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/blueprints-processor/resources/config/application.properties
@@ -11,18 +11,23 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 #  See the License for the specific language governing permissions and

 #  limitations under the License.

-#logging.level.web=DEBUG

-appName={{.Values.config.applicationName}}

-ms_name={{.Values.config.msName}}

-appVersion={{.Values.config.bundleVersion}}

-blueprintsprocessor.grpcEnable={{.Values.config.grpcEnabled}}

-blueprintsprocessor.httpPort={{.Values.service.http.internalPort}}

-blueprintsprocessor.grpcPort={{.Values.service.grpc.internalPort}}

-#Blueprint Processor File Execution and Handling Properties

+

+# Functionality config

+blueprintsprocessor.grpcEnable=true

+blueprintsprocessor.restconfEnabled=true

+blueprintsprocessor.httpPort=8080

+blueprintsprocessor.grpcPort=9111

+

+# Basic Authentication

+security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu

+security.user.name: ccsdkapps

+

+# Blueprint Processor File Execution and Handling Properties

 blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy

 blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive

-#Primary Database Configuration

-blueprintsprocessor.db.primary.url=jdbc:mysql://blueprints-processor-db:3306/sdnctl

+

+# Primary Database Configuration

+blueprintsprocessor.db.primary.url=jdbc:mysql://cds-db:3306/sdnctl

 blueprintsprocessor.db.primary.username=sdnctl

 blueprintsprocessor.db.primary.password=sdnctl

 blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver

@@ -30,5 +35,13 @@ blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=update
 blueprintsprocessor.db.primary.hibernateDDLAuto=update

 blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy

 blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect

-# Web server config

-server.port=8080
\ No newline at end of file
+

+# Python executor

+blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints

+blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints,/opt/app/onap/scripts/jython/ccsdk_netconf

+

+# SDN-C's ODL Restconf Connection Details

+blueprintsprocessor.restclient.sdncodl.type=basic-auth

+blueprintsprocessor.restclient.sdncodl.url=http://sdnc:8282/

+blueprintsprocessor.restclient.sdncodl.username=admin

+blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
\ No newline at end of file
diff --git a/kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml
index 5629913826..94f2fd9152 100755
--- a/kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - {{ index .Values "mariadb-galera" "nameOverride" }}
+        - cds-db
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/cds/charts/blueprints-processor/templates/secrets.yaml b/kubernetes/cds/charts/blueprints-processor/templates/secrets.yaml
deleted file mode 100755
index f21363d087..0000000000
--- a/kubernetes/cds/charts/blueprints-processor/templates/secrets.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2019 IBM, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-  db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
diff --git a/kubernetes/cds/charts/blueprints-processor/templates/service.yaml b/kubernetes/cds/charts/blueprints-processor/templates/service.yaml
index 4c1c32c1ed..5c8bc8cc0d 100755
--- a/kubernetes/cds/charts/blueprints-processor/templates/service.yaml
+++ b/kubernetes/cds/charts/blueprints-processor/templates/service.yaml
@@ -31,15 +31,13 @@ spec:
       {{- if eq .Values.service.type "NodePort"}}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       {{- end}}
-      name: {{ .Values.service.portName | default "http" }}
-    {{- if .Values.config.grpcEnabled}}
+      name: {{ .Values.service.http.portName | default "http" }}
     - port: {{ .Values.service.grpc.externalPort }}
       targetPort: {{ .Values.service.grpc.internalPort }}
       {{- if eq .Values.service.type "NodePort"}}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       {{- end}}
-      name: {{ .Values.service.portName | default "http" }}
-    {{- end}}
+      name: {{ .Values.service.grpc.portName | default "grpc" }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/kubernetes/cds/charts/blueprints-processor/values.yaml b/kubernetes/cds/charts/blueprints-processor/values.yaml
index 2edcc8a4ec..10169d5dc7 100755
--- a/kubernetes/cds/charts/blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/blueprints-processor/values.yaml
@@ -40,7 +40,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-blueprintsprocessor:0.4.1
+image: onap/ccsdk-blueprintsprocessor:0.4-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -48,28 +48,7 @@ debugEnabled: false
 
 # application configuration
 config:
-  applicationName: BlueprintsProcessor
-  msName: "org.onap.ccsdk.apps.blueprintsprocessor"
-  bundleVersion: "1.0.0"
   appConfigDir: /opt/app/onap/config
-  grpcEnabled: false
-  stickySelectorKey:
-  envContext: DEV
-
-mariadb-galera:
-  config:
-    userName: sdnctl
-    userPassword: sdnctl
-    mariadbRootPassword: sdnctl
-    mysqlDatabase: sdnctl
-  nameOverride: blueprints-processor-db
-  service:
-    name: blueprints-processor-db
-    portName: bp-db
-  replicaCount: 1
-  persistence:
-    enabled: true
-    mountSubPath: blueprints-processor/data
 
 # default number of instances
 replicaCount: 1
@@ -92,11 +71,12 @@ readiness:
 
 service:
   type: ClusterIP
-  portName: blueprints-processor
   http:
+    portName: blueprints-processor-http
     internalPort: 8080
     externalPort: 8080
   grpc:
+    portName: blueprints-processor-grpc
     internalPort: 9111
     externalPort: 9111
 
diff --git a/kubernetes/cds/charts/controller-blueprints/requirements.yaml b/kubernetes/cds/charts/controller-blueprints/requirements.yaml
index cefe3d3bdf..857a963ada 100644
--- a/kubernetes/cds/charts/controller-blueprints/requirements.yaml
+++ b/kubernetes/cds/charts/controller-blueprints/requirements.yaml
@@ -13,9 +13,6 @@
 # limitations under the License.
 
 dependencies:
-  - name: mariadb-galera
-    version: ~4.x-0
-    repository: file://../mariadb-galera/
   - name: common
     version: ~4.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/controller-blueprints/resources/config/application.properties b/kubernetes/cds/charts/controller-blueprints/resources/config/application.properties
index 7eec7f9115..80fdaf542e 100755
--- a/kubernetes/cds/charts/controller-blueprints/resources/config/application.properties
+++ b/kubernetes/cds/charts/controller-blueprints/resources/config/application.properties
@@ -13,10 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-appName=ControllerBluePrints
-ms_name=org.onap.ccsdk.apps.controllerblueprints
-appVersion=1.0.0
 
 # Basic Authentication
 basic-auth.user-name=ccsdkapps
@@ -26,20 +22,19 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate.SQL=warn
 logging.level.org.hibernate.type.descriptor.sql=debug
 
-#To Remove Null in JSON API Response
+# To Remove Null in JSON API Response
 spring.jackson.default-property-inclusion=non_null
 
-#Swagger Configuration
+# Swagger Configuration
 swagger.contact.name=CCSDK team
 swagger.contact.url=www.onap.org
 swagger.contact.email=onap-discuss@lists.onap.org
 
+# DB information
 spring.jpa.properties.hibernate.show_sql=true
 spring.jpa.properties.hibernate.use_sql_comments=true
 spring.jpa.properties.hibernate.format_sql=true
-
-# spring.datasource.url, spring.datasource.username,spring.datasource.password  may be overridden by ENV variables
-spring.datasource.url=jdbc:mysql://controller-blueprints-db:3306/sdnctl
+spring.datasource.url=jdbc:mysql://cds-db:3306/sdnctl
 spring.datasource.username=sdnctl
 spring.datasource.password=sdnctl
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
diff --git a/kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml b/kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml
index ef8b38fc10..4cd2e18090 100755
--- a/kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml
+++ b/kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - {{ index .Values "mariadb-galera" "nameOverride" }}
+        - cds-db
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/cds/charts/controller-blueprints/templates/secrets.yaml b/kubernetes/cds/charts/controller-blueprints/templates/secrets.yaml
deleted file mode 100644
index b4ab161809..0000000000
--- a/kubernetes/cds/charts/controller-blueprints/templates/secrets.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2018 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-  db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
-  restUser: {{ .Values.config.restUser | b64enc | quote }}
-  restPassword: {{ .Values.config.restPassword | b64enc | quote }}
diff --git a/kubernetes/cds/charts/controller-blueprints/values.yaml b/kubernetes/cds/charts/controller-blueprints/values.yaml
index 02b5685fa4..246aae482b 100755
--- a/kubernetes/cds/charts/controller-blueprints/values.yaml
+++ b/kubernetes/cds/charts/controller-blueprints/values.yaml
@@ -48,23 +48,6 @@ debugEnabled: false
 config:
   appConfigDir: /opt/app/onap/config
   initDataLoad: true
-  restUser: ccsdkapps
-  restPassword: ccsdkapps
-
-mariadb-galera:
-  config:
-      userName: sdnctl
-      userPassword: sdnctl
-      mariadbRootPassword: sdnctl
-      mysqlDatabase: sdnctl
-  nameOverride: controller-blueprints-db
-  service:
-    name: controller-blueprints-db
-    portName: cb-db
-  replicaCount: 1
-  persistence:
-    enabled: true
-    mountSubPath: controller-blueprints/data
 
 # default number of instances
 replicaCount: 1
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index d7b38dc0b1..51a4e3f9a1 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -17,3 +17,6 @@ dependencies:
   - name: common
     version: ~4.x-0
     repository: '@local'
+  - name: mariadb-galera
+    version: ~4.x-0
+    repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml
index 3815d9af21..06b7cd1211 100644
--- a/kubernetes/cds/values.yaml
+++ b/kubernetes/cds/values.yaml
@@ -34,6 +34,20 @@ pullPolicy: Always
 # application configuration
 config:
 
+mariadb-galera:
+  config:
+      userName: sdnctl
+      userPassword: sdnctl
+      mariadbRootPassword: sdnctl
+      mysqlDatabase: sdnctl
+  nameOverride: cds-db
+  service:
+    name: cds-db
+    portName: cds-db
+  replicaCount: 1
+  persistence:
+    enabled: true
+    mountSubPath: cds/data
 
 # default number of instances
 replicaCount: 1