[INFRA] Helm3 support

As OOM is helm3 compatible, we must be sure that helm testing dockers
has also an helm3 binary.
We're adding it on top of legacy helm2 for compatibility reason

Issue-ID: REQ-442
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ibaf536ad0364bd05f088749afddd0a2693a988f7

diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index f84f976..91019b5 100644 (file)
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/xtesting
 
 ARG KUBERNETES_VERSION="v1.15.11"
 ARG HELM_VERSION="v2.16.6"
+ARG HELM3_VERSION="v3.3.4"
 ARG ONAP_TESTS_TAG=master
 ARG ONAP_TAG=master
 
@@ -20,6 +21,7 @@ RUN set -x && \
     chmod +x /usr/local/bin/kubectl && \
     adduser kubectl -Du 2342 -h /config && \
     wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm && \
+    wget https://get.helm.sh/helm-${HELM3_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm3 && \
     wget -O /check_for_ingress_and_nodeports.py https://git.onap.org/integration/plain/test/security/check_for_ingress_and_nodeports.py?h=$ONAP_TAG &&\
     chmod +x /usr/local/bin/helm && \
     pip3 install --upgrade pip && \