diff options
Diffstat (limited to 'k8s-bootstrap-container')
| -rw-r--r-- | k8s-bootstrap-container/Dockerfile-template | 6 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/bootstrap.sh | 4 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-blueprints.sh | 3 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-plugins.sh (renamed from k8s-bootstrap-container/build-plugins.sh) | 22 | ||||
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 2 |
5 files changed, 8 insertions, 29 deletions
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/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/build-plugins.sh b/k8s-bootstrap-container/load-plugins.sh index 2235438..70abae9 100755 --- a/k8s-bootstrap-container/build-plugins.sh +++ b/k8s-bootstrap-container/load-plugins.sh @@ -20,7 +20,6 @@ # 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) @@ -32,6 +31,7 @@ DEST=wagons 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 \ @@ -41,29 +41,11 @@ dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0-py27-none-any.wgn \ CCSDKPLUGINFILES=\ "\ plugins/pgaas-1.1.0-py27-none-any.wgn -plugins/dmaap-1.3.3-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 " -# 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 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. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>1.6.1</version> + <version>1.6.2</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |