From 6a94f3af61529257cea8ec71fe728f28541a9dba 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 8c95faee..f7a8ef3b 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,17 +1,23 @@ FROM opnfv/functest-kubernetes-core:jerma ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1 +ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.17.txt) && \ case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm64;; x86_64) ARCH=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \ -s --output /usr/local/bin/kubectl && \ + 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/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 && \ chmod +x /usr/local/bin/cnf-conformance ;; esac && \ - chmod +x /usr/local/bin/kubectl && \ mkdir -p /src/cnf-conformance && \ curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/example-cnfs/coredns/cnf-conformance.yml \ -s --output /src/cnf-conformance/cnf-conformance.yml && \ -- cgit 1.2.3-korg