From 8ce58135399768813a4fa49b3ce72de84b58f6ba Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 15 Sep 2020 23:18:16 +0200 Subject: Publish helm_vims also based on clearwater-docker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It leverages helm rather than kubectl as proposed by k8s_vims. A new abstract class Vims is added to factorize code between both testcases. Change-Id: Ie5de8d62e25e74f73f8e32167228a08e82989abd Signed-off-by: Cédric Ollivier (cherry picked from commit 32dfc10f56ead9abea8798e1ce16fe87652ca480) --- docker/cnf/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docker/cnf/Dockerfile') diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index c2288680..b0461ad4 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -2,6 +2,7 @@ FROM opnfv/functest-kubernetes-core:hunter ARG K8S_TAG=v1.13.12 ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1 +ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ apk --no-cache add --virtual .build-deps --update make rsync findutils gcc musl-dev && \ @@ -12,7 +13,12 @@ RUN apk --no-cache add --update wget curl libc6-compat && \ git checkout FETCH_HEAD && \ make kubectl && \ mv _output/bin/* /usr/local/bin) && \ - rm -r /src/k8s.io && \ + curl https://get.helm.sh/helm-$HELM_TAG-linux-$ARCH.tar.gz \ + -s --output /src/helm-$HELM_TAG-linux-$ARCH.tar.gz && \ + tar zxf /src/helm-$HELM_TAG-linux-$ARCH.tar.gz linux-$ARCH/helm -C /src && \ + mv /src/linux-$ARCH/helm /usr/local/bin && \ + chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ + rm -r /src/k8s.io /src/helm-$HELM_TAG-linux-$ARCH.tar.gz /src/linux-$ARCH && \ case $(uname -m) in x86_64) \ curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$(echo $CNF_CONFORMANCE_TAG |cut -d\- -f 1)-$ARCH-static \ -Ls --output /usr/local/bin/cnf-conformance && \ -- cgit 1.2.3-korg