From 2d209e14e0c7f73fa67396877bcc3ab319896059 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 20 Aug 2021 15:12:41 +0200 Subject: Swith to v1.23 alphas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I226ff09b0a4ca8082736f4d695e67154940ce249 Signed-off-by: Cédric Ollivier --- docker/cnf/Dockerfile | 3 +-- docker/healthcheck/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index c7cd53d1..adf4c23a 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,10 @@ FROM opnfv/functest-kubernetes-core -ARG K8S_TAG=1.22 ARG CNF_TESTSUITE_TAG=v0.11.2 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 4788413d..dc39ca0c 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,9 +1,7 @@ FROM opnfv/functest-kubernetes-core -ARG K8S_TAG=1.22 - RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 && \ -- cgit 1.2.3-korg