From a73e3e7f103e1637b2b697195d7688a3b4381ce4 Mon Sep 17 00:00:00 2001
From: Jack Lucas <jflucas@research.att.com>
Date: Fri, 10 Jan 2020 14:14:33 -0500
Subject: Update plugin versions

Also improve error detection during curl downloads

Issue-ID: DCAEGEN2-2018
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I583a0366e9d20afe1d2a038b9b96331e7cad6804
---
 k8s-bootstrap-container/Dockerfile-template |  4 ++--
 k8s-bootstrap-container/load-blueprints.sh  |  3 ++-
 k8s-bootstrap-container/load-plugins.sh     | 12 ++++++------
 k8s-bootstrap-container/pom.xml             |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/k8s-bootstrap-container/Dockerfile-template b/k8s-bootstrap-container/Dockerfile-template
index 358f59b..583de52 100644
--- a/k8s-bootstrap-container/Dockerfile-template
+++ b/k8s-bootstrap-container/Dockerfile-template
@@ -32,13 +32,13 @@ RUN yum install -y unzip \
   && mkdir -p /opt/consul/bin \
   && mkdir -p /opt/consul/data \
   && mkdir -p /opt/consul/config \
-  && curl -Ss https://releases.hashicorp.com/consul/1.2.1/consul_1.2.1_linux_amd64.zip > /tmp/consul.zip \
+  && curl -Ssf https://releases.hashicorp.com/consul/1.2.1/consul_1.2.1_linux_amd64.zip > /tmp/consul.zip \
   && unzip -pj /tmp/consul.zip > /opt/consul/bin/consul \
   && chmod +x /opt/consul/bin/consul
 COPY 00-consul.json /opt/consul/config/
 
 # Install jq
-RUN curl -Ss -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"  > /bin/jq \
+RUN curl -Ssf -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"  > /bin/jq \
 && chmod +x /bin/jq
 
 # Install pip and Cloudify CLI (stay at version 4.2 because of changes in higher versions)
diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index 6a573c4..0947c7e 100755
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -19,6 +19,7 @@
 # Expect blueprints to be at <base URL>/blueprints
 
 set -x
+set -e
 
 BLUEPRINTS=\
 "
@@ -40,5 +41,5 @@ mkdir ${BPDEST}
 # Download blueprints
 for bp in ${BLUEPRINTS}
 do
-    curl -Ss $1/blueprints/${bp} > ${BPDEST}/$(basename ${bp})
+    curl -Ssf $1/blueprints/${bp} > ${BPDEST}/$(basename ${bp})
 done
diff --git a/k8s-bootstrap-container/load-plugins.sh b/k8s-bootstrap-container/load-plugins.sh
index 70abae9..aa5424d 100755
--- a/k8s-bootstrap-container/load-plugins.sh
+++ b/k8s-bootstrap-container/load-plugins.sh
@@ -25,16 +25,16 @@
 # (This script runs at Docker image build time)
 #
 set -x
+set -e
 DEST=wagons
 
 # For DCAE, starting in R5, we pull down wagons directly
 DCAEPLUGINFILES=\
 "\
-k8splugin/1.4.13/k8splugin-1.4.13-py27-none-linux_x86_64.wgn
-k8splugin/1.6.0/k8splugin-1.6.0-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 \
+k8splugin/1.7.1/k8splugin-1.7.1-py27-none-linux_x86_64.wgn
+relationshipplugin/1.1.0/relationshipplugin-1.1.0-py27-none-linux_x86_64.wgn
+clamppolicyplugin/1.1.0/clamppolicyplugin-1.1.0-py27-none-linux_x86_64.wgn
+dcaepolicyplugin/2.4.0/dcaepolicyplugin-2.4.0-py27-none-linux_x86_64.wgn \
 "
 
 # For CCSDK, we pull down the wagon files directly
@@ -53,7 +53,7 @@ function get_wagons {
 	for wagon in $2
 	do
 		target=$(basename ${wagon})
-		curl -Ss $1/${wagon} > ${DEST}/${target}
+		curl -Ssf $1/${wagon} > ${DEST}/${target}
 	done
 }
 
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 3150dd8..1adaa7b 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.6.5</version>
+  <version>1.7.0</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
cgit 1.2.3-korg