From: Jack Lucas <jflucas@research.att.com>
Date: Thu, 17 Jan 2019 18:53:56 +0000 (-0500)
Subject: Move CBS to Helm deployment
X-Git-Tag: 1.4.16~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0025fda3bdc37f9cd1d436f9541eace023a0afc3;p=dcaegen2%2Fdeployments.git

Move CBS to Helm deployment

Stop including CBS blueprint in bootstrap container
Stop deploying the CBS blueprint in the bootstrap script
Change healthcheck so that it looks for Helm-deployed CBS

Issue-ID: DCAEGEN2-1090
Change-Id: Ifeba9768374045831e4d1f3f06a77ec9a79753c7
Signed-off-by: Jack Lucas <jflucas@research.att.com>
---

diff --git a/healthcheck-container/healthcheck.js b/healthcheck-container/healthcheck.js
index 7a03f1e..9bc2086 100644
--- a/healthcheck-container/healthcheck.js
+++ b/healthcheck-container/healthcheck.js
@@ -26,13 +26,13 @@ const UNKNOWN = 503;
 // List of deployments expected to be created via Helm
 const helmDeps =
     [
-        'dcae-cloudify-manager'
+        'dcae-cloudify-manager',
+        'dcae-config-binding-service'
     ];
 
 // List of deployments expected to be created by CM at boot time
 const bootDeps =
     [
-        'dep-config-binding-service',
         'dep-deployment-handler',
         'dep-inventory',
         'dep-service-change-handler',
diff --git a/healthcheck-container/package.json b/healthcheck-container/package.json
index 674d382..31f1493 100644
--- a/healthcheck-container/package.json
+++ b/healthcheck-container/package.json
@@ -1,7 +1,7 @@
 {
   "name": "k8s-healthcheck",
   "description": "DCAE healthcheck server",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "healthcheck.js",
   "author": "author",
   "license": "(Apache-2.0)"
diff --git a/healthcheck-container/pom.xml b/healthcheck-container/pom.xml
index 1f024e0..b768337 100644
--- a/healthcheck-container/pom.xml
+++ b/healthcheck-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>healthcheck-container</artifactId>
   <name>dcaegen2-deployments-healthcheck-container</name>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 43a0537..c037182 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -201,12 +201,9 @@ set +e
 
 # Deploy platform components
 # Allow for some parallelism to speed up the process.  Probably could be somewhat more aggressive.
-# config_binding_service and pgaas_initdb needed by others, but can execute in parallel
-deploy config_binding_service k8s-config_binding_service.yaml k8s-config_binding_service-inputs.yaml &
-CBS_PID=$!
 deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml &
 PG_PID=$!
-wait ${CBS_PID} ${PG_PID}
+wait ${PG_PID}
 # inventory, deployment_handler, and policy_handler can be deployed simultaneously
 deploy inventory k8s-inventory.yaml k8s-inventory-inputs.yaml &
 INV_PID=$!
diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index fbbb194..716e601 100755
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -7,7 +7,6 @@ set -x
 
 BLUEPRINTS=\
 "
-k8s-config_binding_service.yaml  \
 k8s-deployment_handler.yaml  \
 k8s-holmes-engine.yaml \
 k8s-holmes-rules.yaml \
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index d40bb9d..e695f6d 100644
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.4.5</version>
+  <version>1.4.6</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>