diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-01-17 13:53:56 -0500 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-01-17 13:57:48 -0500 |
| commit | 0025fda3bdc37f9cd1d436f9541eace023a0afc3 (patch) | |
| tree | 2226390764927b84f6c514bc1fc94a762eefaf5f /k8s-bootstrap-container | |
| parent | 1d746685f1d61f36182d67ff7f24f0f0a18a4c66 (diff) | |
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>
Diffstat (limited to 'k8s-bootstrap-container')
| -rwxr-xr-x | k8s-bootstrap-container/bootstrap.sh | 5 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-blueprints.sh | 1 | ||||
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 2 |
3 files changed, 2 insertions, 6 deletions
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> |