From: Cédric Ollivier Date: Mon, 5 Apr 2021 08:58:29 +0000 (+0200) Subject: Switch to latest-1.21 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c8018add6a158e24c3db566e3cd0ab91f77fc607;p=functest-kubernetes.git Switch to latest-1.21 Else it would consider v1.22.0-alpha.0 (N+2). Change-Id: Ie98418fc7068beb338a057af8ce8e092150cb696 Signed-off-by: Cédric Ollivier --- diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 60e0cfbf..a0fc1f9f 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,11 @@ FROM opnfv/functest-kubernetes-core -ARG K8S_TAG=latest +ARG K8S_TAG=1.21 ARG CNF_CONFORMANCE_TAG=v0.9.19 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 0a8069a0..31e882a7 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,9 +1,9 @@ FROM opnfv/functest-kubernetes-core -ARG K8S_TAG=latest +ARG K8S_TAG=1.21 RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ -s --output /usr/local/bin/kubectl && \