summaryrefslogtreecommitdiffstats
path: root/k8s-bootstrap-container
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-05-23 18:21:17 -0400
committerJack Lucas <jflucas@research.att.com>2019-05-24 10:16:38 -0400
commitdab0be7327dffdbfe220c96e265706dc919f6374 (patch)
tree66be1ad006f6f7b2e969d3b4e6dc3272d6f8bde7 /k8s-bootstrap-container
parent403eb3082eae966111437acf8d0d95a519788c68 (diff)
Pull DCAE plugins from Nexus
Change-Id: Ifca0978cca90e00f0ad59702b2024d0970df8ec9 Issue-ID: DCAEGEN2-1520 Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'k8s-bootstrap-container')
-rw-r--r--k8s-bootstrap-container/README.md7
-rwxr-xr-xk8s-bootstrap-container/build-plugins.sh15
-rw-r--r--k8s-bootstrap-container/pom.xml2
3 files changed, 11 insertions, 13 deletions
diff --git a/k8s-bootstrap-container/README.md b/k8s-bootstrap-container/README.md
index 614669b..0e8f88d 100644
--- a/k8s-bootstrap-container/README.md
+++ b/k8s-bootstrap-container/README.md
@@ -2,9 +2,8 @@
This container is responsible for loading plugins and wagons onto the
DCAE Cloudify Manager instance and for launching DCAE components.
-The script builds plugins and loads blueprints for the DCAE components
-to be deployed into the container image
-at image build time. At run time, the main script in the container
+The Docker image build process loads plugins and blueprints into the
+image's file system. At run time, the main script in the container
(`bootstrap.sh`) uploads the plugins to Cloudify Manager, then installs
components using the blueprints.
@@ -15,6 +14,6 @@ The container expects to be started with two environment variables:
The container expects input files to use when deploying the blueprints.
It expects to find them in /inputs. The normal method for launching
the container is via a Helm Chart launched by OOM. That chart creates
-a Kubernetes ConfigMap containing the input files. The ConfigMap is
+a Kubernetes ConfigMap containing the input files. The ConfigMap is
mounted as a volume at /inputs.
diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh
index e331c66..786d58e 100755
--- a/k8s-bootstrap-container/build-plugins.sh
+++ b/k8s-bootstrap-container/build-plugins.sh
@@ -28,15 +28,13 @@
set -x
DEST=wagons
-# For DCAE, we get zips of the archives and build wagons
-# 2 versions of k8s plugin to ease transition
+# For DCAE, starting in R5, we pull down wagons directly
DCAEPLUGINFILES=\
"\
-k8splugin/1.4.5/k8splugin-1.4.5.tgz
-k8splugin/1.4.13/k8splugin-1.4.13.tgz
-relationshipplugin/1.0.0/relationshipplugin-1.0.0.tgz
-clamppolicyplugin/1.0.0/clamppolicyplugin-1.0.0.tgz
-dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0.tgz \
+k8splugin/1.4.13/k8splugin-1.4.13-py27-none-linux_x86_64.wgn
+relationshipplugin/1.0.0/relationshipplugin-1.0.0-py27-none-any.wgn
+clamppolicyplugin/1.0.0/clamppolicyplugin-1.0.0-py27-none-any.wgn
+dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0-py27-none-any.wgn \
"
# For CCSDK, we pull down the wagon files directly
@@ -48,6 +46,7 @@ plugins/sshkeyshare-1.0.0-py27-none-any.wgn
plugins/helm-4.0.0-py27-none-linux_x86_64.wgn
"
+# Not needed in R5
# Build a set of wagon files from archives in a repo
# $1 -- repo base URL
# $2 -- list of paths to archive files in the repo
@@ -77,5 +76,5 @@ function get_wagons {
}
mkdir ${DEST}
-build $1 "${DCAEPLUGINFILES}"
+get_wagons $1 "${DCAEPLUGINFILES}"
get_wagons $2 "${CCSDKPLUGINFILES}"
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 34120e1..04af8c7 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.5.0</version>
+ <version>1.5.1</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>