Stop using storage.googleapis.com

Change-Id: If1fd1845cee8d185d6c0fb0b238dfac16928cd8e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index ceaf5ba..a8f3ba5 100644 (file)
--- 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 b8970d9..760a156 100644 (file)
--- 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 && \