From b36dee48ba9ae2a081ebba51cc4f5bea509321fe Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Mon, 22 Jul 2019 11:06:29 -0400 Subject: Update k8s & dmaap plugins Also remove blueprint-based deployment of dashboard (now being done via Helm) Issue-ID: DCAEGEN2-1651 Issue-ID: DCAEGEN2-1653 Issue-ID: DCAEGEN2-1667 Issue-ID: DCAEGEN2-1670 Issue-ID: DCAEGEN2-1318 Change-Id: I5d7b88d2bc6ed508f5500a1df553745f44d660af Signed-off-by: Jack Lucas --- cm-container/pom.xml | 2 +- cm-container/scripts/get-type-files.sh | 2 +- k8s-bootstrap-container/Dockerfile-template | 6 +-- k8s-bootstrap-container/bootstrap.sh | 4 +- k8s-bootstrap-container/build-plugins.sh | 80 ----------------------------- k8s-bootstrap-container/load-blueprints.sh | 3 +- k8s-bootstrap-container/load-plugins.sh | 62 ++++++++++++++++++++++ k8s-bootstrap-container/pom.xml | 2 +- 8 files changed, 70 insertions(+), 91 deletions(-) delete mode 100755 k8s-bootstrap-container/build-plugins.sh create mode 100755 k8s-bootstrap-container/load-plugins.sh diff --git a/cm-container/pom.xml b/cm-container/pom.xml index 0a9100f..e13083d 100644 --- a/cm-container/pom.xml +++ b/cm-container/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.dcaegen2.deployments cm-container dcaegen2-deployments-cm-container - 2.0.0 + 2.0.1 http://maven.apache.org UTF-8 diff --git a/cm-container/scripts/get-type-files.sh b/cm-container/scripts/get-type-files.sh index fb44175..aa50bb7 100755 --- a/cm-container/scripts/get-type-files.sh +++ b/cm-container/scripts/get-type-files.sh @@ -30,8 +30,8 @@ DCAETYPEFILES=\ "\ /dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml \ /relationshipplugin/1.0.0/relationshipplugin_types.yaml \ -/k8splugin/1.4.5/k8splugin_types.yaml \ /k8splugin/1.4.13/k8splugin_types.yaml \ +/k8splugin/1.6.0/k8splugin_types.yaml \ clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml \ " diff --git a/k8s-bootstrap-container/Dockerfile-template b/k8s-bootstrap-container/Dockerfile-template index 9f95eb8..358f59b 100644 --- a/k8s-bootstrap-container/Dockerfile-template +++ b/k8s-bootstrap-container/Dockerfile-template @@ -49,12 +49,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ # Copy scripts RUN mkdir scripts -COPY build-plugins.sh load-blueprints.sh bootstrap.sh uninstall.sh scripts/ +COPY load-plugins.sh load-blueprints.sh bootstrap.sh uninstall.sh scripts/ RUN chmod +x /scripts/*.sh # Get plugin archives and build wagons -RUN scripts/build-plugins.sh ${DCAE_REPO} ${CCSDK_REPO} \ - && rm scripts/build-plugins.sh +RUN scripts/load-plugins.sh ${DCAE_REPO} ${CCSDK_REPO} \ + && rm scripts/load-plugins.sh # Load blueprints and input templates RUN scripts/load-blueprints.sh ${BP_REPO} \ diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh index 82df4b4..b23e908 100755 --- a/k8s-bootstrap-container/bootstrap.sh +++ b/k8s-bootstrap-container/bootstrap.sh @@ -220,10 +220,8 @@ done trap - ERR set +e -# Deploy platform components -# No opportunity for parallelism here -- dashboard needs pgaas +# Initialize the DCAE postgres instance deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml -deploy dashboard k8s-dashboard.yaml k8s-dashboard-inputs.yaml # Deploy service components # tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh deleted file mode 100755 index 2235438..0000000 --- a/k8s-bootstrap-container/build-plugins.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ -# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. - -# Pull plugin archives from repos -# Build wagons -# $1 is the DCAE repo URL -# $2 is the CCSDK repo URL -# (This script runs at Docker image build time) -# -set -x -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 -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 -CCSDKPLUGINFILES=\ -"\ -plugins/pgaas-1.1.0-py27-none-any.wgn -plugins/dmaap-1.3.3-py27-none-any.wgn -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 -function build { - for plugin in $2 - do - # Could just do wagon create with the archive URL as source, - # but can't use a requirements file with that approach - mkdir work - target=$(basename ${plugin}) - curl -Ss $1/${plugin} > ${target} - tar zxvf ${target} --strip-components=2 -C work - wagon create -t tar.gz -o ${DEST} -r work/requirements.txt --validate ./work - rm -rf work - done -} - -# Copy a set of wagons from a repo -# $1 -- repo baseURL -# $2 -- list of paths to wagons in the repo -function get_wagons { - for wagon in $2 - do - target=$(basename ${wagon}) - curl -Ss $1/${wagon} > ${DEST}/${target} - done -} - -mkdir ${DEST} -get_wagons $1 "${DCAEPLUGINFILES}" -get_wagons $2 "${CCSDKPLUGINFILES}" diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh index e6838e6..6a573c4 100755 --- a/k8s-bootstrap-container/load-blueprints.sh +++ b/k8s-bootstrap-container/load-blueprints.sh @@ -31,8 +31,7 @@ k8s-snmptrap.yaml \ k8s-prh.yaml \ k8s-hv-ves.yaml \ k8s-helm-override.yaml \ -k8s-helm.yaml \ -k8s-dashboard.yaml +k8s-helm.yaml " BPDEST=blueprints diff --git a/k8s-bootstrap-container/load-plugins.sh b/k8s-bootstrap-container/load-plugins.sh new file mode 100755 index 0000000..70abae9 --- /dev/null +++ b/k8s-bootstrap-container/load-plugins.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# ============LICENSE_START======================================================= +# org.onap.dcae +# ================================================================================ +# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. + +# Pull plugin archives from repos +# $1 is the DCAE repo URL +# $2 is the CCSDK repo URL +# (This script runs at Docker image build time) +# +set -x +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 \ +" + +# For CCSDK, we pull down the wagon files directly +CCSDKPLUGINFILES=\ +"\ +plugins/pgaas-1.1.0-py27-none-any.wgn +plugins/dmaap-1.3.5-py27-none-any.wgn +plugins/sshkeyshare-1.0.0-py27-none-any.wgn +plugins/helm-4.0.0-py27-none-linux_x86_64.wgn +" + +# Copy a set of wagons from a repo +# $1 -- repo baseURL +# $2 -- list of paths to wagons in the repo +function get_wagons { + for wagon in $2 + do + target=$(basename ${wagon}) + curl -Ss $1/${wagon} > ${DEST}/${target} + done +} + +mkdir ${DEST} +get_wagons $1 "${DCAEPLUGINFILES}" +get_wagons $2 "${CCSDKPLUGINFILES}" diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml index 45222c6..b6a1090 100644 --- a/k8s-bootstrap-container/pom.xml +++ b/k8s-bootstrap-container/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.dcaegen2.deployments k8s-bootstrap-container dcaegen2-deployments-k8s-bootstrap-container - 1.6.1 + 1.6.2 http://maven.apache.org UTF-8 -- cgit 1.2.3-korg