From ad559e8b794149f641ee4d5ca515af513fe496ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 19 Jan 2025 15:35:57 +0100 Subject: [PATCH] Stop using storage.googleapis.com MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: If1fd1845cee8d185d6c0fb0b238dfac16928cd8e Signed-off-by: Cédric Ollivier --- docker/cnf/Dockerfile | 4 ++-- docker/healthcheck/Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index ceaf5ba4..a8f3ba52 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -6,9 +6,9 @@ ARG HELM_TAG=v3.6.0 USER root RUN apk --no-cache add --update wget curl ncurses git yaml openssl zlib && \ apk --no-cache add --virtual .build-deps --update crystal shards make yaml-dev openssl-dev zlib-dev patch openssl-libs-static yaml-static zlib-static && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt) && \ + tag=$(curl -Ls https://dl.k8s.io/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 \ + curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ curl https://get.helm.sh/helm-$HELM_TAG-linux-$arch.tar.gz \ --output /src/helm-$HELM_TAG-linux-$arch.tar.gz && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index b8970d98..760a156f 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -2,12 +2,12 @@ FROM opnfv/functest-kubernetes-core USER root RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.30.txt) && \ + tag=$(curl -Ls https://dl.k8s.io/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 && \ - curl https://storage.googleapis.com/kubernetes-release/release/$tag/kubernetes-test-linux-$arch.tar.gz \ - -s --output /src/kubernetes-test-linux-$arch.tar.gz && \ + curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \ + --output /usr/local/bin/kubectl && \ + curl -Ls https://dl.k8s.io/release/$tag/kubernetes-test-linux-$arch.tar.gz \ + --output /src/kubernetes-test-linux-$arch.tar.gz && \ tar zxf /src/kubernetes-test-linux-$arch.tar.gz kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo -C /src && \ mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \ -- 2.16.6