diff --git a/.circleci/config.yml b/.circleci/config.yml index 6bcee072..f9bac9f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: - run: name: Install helm environment: - HELM_VERSION: v3.0.0-rc.2 + HELM_VERSION: v3.0.0 command: | HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" curl -Lo ${HELM_FILENAME} "https://get.helm.sh/${HELM_FILENAME}" diff --git a/Dockerfile.helm3 b/Dockerfile.helm3 index e0846d40..1436b2cb 100644 --- a/Dockerfile.helm3 +++ b/Dockerfile.helm3 @@ -11,10 +11,10 @@ FROM alpine:3.10 RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION=v3.0.0-rc.2 +ARG HELM_VERSION=v3.0.0 ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="b6fff8e01aa6cd9a4541bd48172bb53b9a0ae38d7e7783a8e0fcc1db63802aaa" +ARG HELM_SHA256="10e1fdcca263062b1d7b2cb93a924be1ef3dd6c381263d8151dd1a20a3d8c0dc" RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ diff --git a/test/integration/run.sh b/test/integration/run.sh index 03d55c9e..ec9605fb 100755 --- a/test/integration/run.sh +++ b/test/integration/run.sh @@ -46,7 +46,7 @@ function retry() { set -e info "Using namespace: ${test_ns}" # helm v2 -if helm version --client 1>/dev/null 2>/dev/null; then +if helm version --client 2>/dev/null | grep '"v2\.'; then info "Using Helm version: $(helm version --short --client | grep -o v.*$)" ${helm} init --wait --override spec.template.spec.automountServiceAccountToken=true # helm v3