aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-30 11:41:55 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2020-12-14 13:12:25 +0000
commit30451d9debd2a6d29c1f6fc722b3abd0aba207e7 (patch)
treeb66bdd4290a7287ce7ec30bdfa2efb52a1d3ac4c
parent844d0c16a8423fb8ba49410398c286bb83bd0c9b (diff)
[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 (cherry picked from commit 7392e6a77d48cf74c2cc58ec412ba7baf6dc8e4b)
-rw-r--r--infra-healthcheck/docker/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index 287823c..7964f34 100644
--- 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=guilin
ARG ONAP_TAG=guilin
@@ -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 && \