summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lucas <jflos@sonoris.net>2021-06-03 12:55:52 -0400
committerJack Lucas <jflos@sonoris.net>2021-06-03 13:10:44 -0400
commitfa2da723f3a604ec852b7a5a11c5703e2c0674ea (patch)
tree999fb365946ce755cb1e0cb511755c3479b88955
parentf5d20c5ca01ca229f7637961d47b3e39406df751 (diff)
Remove DCAE microservice component from bootstrap
All of the "statically-deployed" DCAE microservices are now being deployed with Helm, so it is no longer necessary to deploy them via Cloudify in the DCAE bootstrap process. Issue-ID: DCAEGEN2-2617 Signed-off-by: Jack Lucas <jflos@sonoris.net> Change-Id: Id40b7891cf4b836d22ddc338410b8b872fb08c69
-rw-r--r--Changelog.md9
-rw-r--r--README.md12
-rw-r--r--pom.xml2
-rwxr-xr-xscripts/bootstrap.sh26
-rw-r--r--version.properties2
5 files changed, 29 insertions, 22 deletions
diff --git a/Changelog.md b/Changelog.md
index 9db2342..0fef6b8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [3.2.0] - 2021-06-04
+ - [DCAEGEN2-2617](https://jira.onap.org/browse/DCAEGEN2-2617) - Remove DCAE service component deployment from bootstrap container
+
## [3.1.0] - 2021-04-16
- [DCAEGEN2-2420](https://jira.onap.org/browse/DCAEGEN2-2420) - PRH 1.6.0, PM-Mapper 1.6.0 and TCA-Gen2 1.3.0 integration base image alignemnt
- - [DCAEGEN2-2732](https://jira.onap.org/browse/DCAEGEN2-2732) - PM-Mapper 1.6.0 Utilize SDK/Dmaap client
+ - [DCAEGEN2-2732](https://jira.onap.org/browse/DCAEGEN2-2732) - PM-Mapper 1.6.0 Utilize SDK/Dmaap client
- [DCAEGEN2-2675](https://jira.onap.org/browse/DCAEGEN2-2675) - RESTConf 1.2.5 - xml parsing vulnerability
- [DCAEGEN2-2590](https://jira.onap.org/browse/DCAEGEN2-2590) - TCA-Gen2 1.3.0 - vulnerability removal
- [DCAEGEN2-2713](https://jira.onap.org/browse/DCAEGEN2-2713) - PMSH 1.3.1 - policy config consolidation under app-config
@@ -30,7 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [DCAEGEN2-2599](https://jira.onap.org/browse/DCAEGEN2-2599) - Vulnerability removal for son-handler
- [DCAEGEN2-2623](https://jira.onap.org/browse/DCAEGEN2-2623) - Add new fields to Slice-analysis-ms blueprint (AAI update)
- [DCAEGEN2-2494](https://jira.onap.org/browse/DCAEGEN2-2494) - SNMPtrap collector version revision (pysnmp upgrade)
- - [DCAEGEN2-2551](https://jira.onap.org/browse/DCAEGEN2-2551) - Vulnerability removal for RESTConf collector
+ - [DCAEGEN2-2551](https://jira.onap.org/browse/DCAEGEN2-2551) - Vulnerability removal for RESTConf collector
## [3.0.2] - 2021-02-15
@@ -43,4 +46,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade prh.prh-app-server to 1.5.5
- [DCAEGEN2-2493](https://jira.onap.org/browse/DCAEGEN2-2493) - RCC blueprint updated to use latest k8s plugin & 1.2.3 version (vulnerability fixes)
- [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes)
- - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes)
+ - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes)
diff --git a/README.md b/README.md
index 41fffca..43763fe 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@
This repository holds the source code needed to build the
Docker image for the DCAE bootstrap container. The bootstrap
container runs at DCAE deployment time (via a Helm chart) and
-does initial setup of the DCAE environment. This includes
-deploying several service components using Cloudify Manager.
+does initial setup of the DCAE environment.
This repository also holds Cloudify blueprints for service components.
The Docker build process copies these blueprints into the Docker image
@@ -17,13 +16,14 @@ The Docker build process for the bootstrap containter image pulled the blueprint
## DCAE Bootstrap Container
This container is responsible for loading blueprints onto the
-DCAE Cloudify Manager instance and for launching DCAE components.
+DCAE inventory component. It also provides an environment for debugging
+any issues related to Cloudify deployments, since it has the Cloudify
+"cfy" command line tool available.
-The Docker image build process loads blueprints into the
+The Docker image build process loads blueprints into the
image's file system. The blueprints are copied from the `blueprints` directory in this repository.
At run time, the main script in the container
-(`bootstrap.sh`) installs
-components using the blueprints.
+(`bootstrap.sh`) uploads the blueprints to the DCAE inventory component.
The container expects to be started with two environment variables:
- `CMADDR` -- the address of the target Cloudify Manager
diff --git a/pom.xml b/pom.xml
index 663eb1e..40b10c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>k8s-bootstrap-container</artifactId>
<name>dcaegen2-deployments-k8s-bootstrap-container</name>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 035c62d..0f4c15c 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -16,12 +16,24 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-# Install DCAE via Cloudify Manager
+# Prior to the "H" release, this bootstrap script was used to deploy DCAE components
+# during the initial DCAE installation process using Cloudify Manager with Cloudify
+# blueprints. Over the course of several releases, we have migrated these components to use Helm
+# deployment, starting with the DCAE "platform components" and, in the "H" release, the 4
+# DCAE microservices that are always launched when DCAE is deployed.
+#
+# For the "I" release, we are expecting to migrate all DCAE microservices to Helm deployment,
+# including the microservices that are launched on demand after initial DCAE installation.
+# We are continuing to provide support for Cloudify deployments during the "I" release. This
+# bootstrap script will deploy the Cloudify blueprint that initializes the Cloudify-based
+# DCAE postgres instance and will upload all of the DCAE Cloudify blueprints to the DCAE
+# inventory component. The bootstrap container will continue to run after its deployment and
+# upload work is complete. User can "exec" into the bootstrap container and use the Cloudify
+# "cfy" command to debug any issues related to Cloudify deployments.
+#
# Expects:
# CM address (IP or DNS) in CMADDR environment variable
# CM password in CMPASS environment variable (assumes user is "admin")
-# ONAP common Kubernetes namespace in ONAP_NAMESPACE environment variable
-# If DCAE components are deployed in a separate Kubernetes namespace, that namespace in DCAE_NAMESPACE variable.
# Blueprints for components to be installed in /blueprints
# Input files for components to be installed in /inputs
# Optionally, allows:
@@ -116,7 +128,6 @@ function deploy {
fi
}
-
### END FUNCTION DEFINTIONS ###
set -x
@@ -142,13 +153,6 @@ set +e
# Initialize the DCAE postgres instance
deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
-# Deploy service components
-# tcagen2, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
-deploy tcagen2 k8s-tcagen2.yaml k8s-tcagen2-inputs.yaml &
-deploy ves-tls k8s-ves.yaml k8s-ves-inputs-tls.yaml &
-deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
-deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
-
# Display deployments, for debugging purposes
cfy deployments list
diff --git a/version.properties b/version.properties
index decdfc4..f1f03dc 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
major=3
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}