From 046656a907bbad5f442b26e524e4b1ce3eff1289 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 31 Mar 2021 14:34:46 -0400 Subject: [PATCH 1/2] dl.k8s.io: Redirect CI URIs to Kubernetes Community infra krel ci-build has been successfully building and pushing CI Kubernetes builds for a time now. Updating this redirect (dl.k8s.io/ci) to Kubernetes Community infra moves us closer to no longer relying on the kubernetes-release-dev (Google-owned) bucket. Signed-off-by: Stephen Augustus --- k8s.io/configmap-nginx.yaml | 2 +- k8s.io/test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s.io/configmap-nginx.yaml b/k8s.io/configmap-nginx.yaml index 7a7a87938d0..d6018cf9703 100644 --- a/k8s.io/configmap-nginx.yaml +++ b/k8s.io/configmap-nginx.yaml @@ -158,7 +158,7 @@ data: # Don't require /release/ if you want to get at the Kubernetes release artifacts, the common case. rewrite ^/(v[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?/.*)$ https://storage.googleapis.com/kubernetes-release/release/$1 redirect; # Provide a convenient redirect for CI (continuous integration) artifacts as well, which live in a different bucket. - rewrite ^/ci(-cross)?/?(.*)$ https://storage.googleapis.com/kubernetes-release-dev/ci$1/$2 redirect; + rewrite ^/ci(-cross)?/?(.*)$ https://storage.googleapis.com/k8s-release-dev/ci$1/$2 redirect; rewrite ^/(.*)$ https://storage.googleapis.com/kubernetes-release/$1 redirect; } } diff --git a/k8s.io/test.py b/k8s.io/test.py index 95e59745635..4d99cb1d724 100755 --- a/k8s.io/test.py +++ b/k8s.io/test.py @@ -290,15 +290,15 @@ def test_dl(self): # A few /ci/ tests self.assert_temp_redirect( base + '/ci/v$ver/$path', - 'https://storage.googleapis.com/kubernetes-release-dev/ci/v$ver/$path', + 'https://storage.googleapis.com/k8s-release-dev/ci/v$ver/$path', ver=rand_num(), path=rand_num()) self.assert_temp_redirect( base + '/ci/latest-$ver.txt', - 'https://storage.googleapis.com/kubernetes-release-dev/ci/latest-$ver.txt', + 'https://storage.googleapis.com/k8s-release-dev/ci/latest-$ver.txt', ver=rand_num()) self.assert_temp_redirect( base + '/ci-cross/v$ver/$path', - 'https://storage.googleapis.com/kubernetes-release-dev/ci-cross/v$ver/$path', + 'https://storage.googleapis.com/k8s-release-dev/ci-cross/v$ver/$path', ver=rand_num(), path=rand_num()) # Base case self.assert_temp_redirect( From cb12adb5eb18d0d8b3e44cd7f1a55f08420bd872 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 31 Mar 2021 14:46:59 -0400 Subject: [PATCH 2/2] dl.k8s.io: Remove ci-cross redirects All Kubernetes builds that land in the 'ci' directory of k8s-release-dev are cross builds, so this reference is no longer required. Signed-off-by: Stephen Augustus --- k8s.io/configmap-nginx.yaml | 2 +- k8s.io/test.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/k8s.io/configmap-nginx.yaml b/k8s.io/configmap-nginx.yaml index d6018cf9703..53962ee2e23 100644 --- a/k8s.io/configmap-nginx.yaml +++ b/k8s.io/configmap-nginx.yaml @@ -158,7 +158,7 @@ data: # Don't require /release/ if you want to get at the Kubernetes release artifacts, the common case. rewrite ^/(v[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?/.*)$ https://storage.googleapis.com/kubernetes-release/release/$1 redirect; # Provide a convenient redirect for CI (continuous integration) artifacts as well, which live in a different bucket. - rewrite ^/ci(-cross)?/?(.*)$ https://storage.googleapis.com/k8s-release-dev/ci$1/$2 redirect; + rewrite ^/ci/?(.*)$ https://storage.googleapis.com/k8s-release-dev/ci$1/$2 redirect; rewrite ^/(.*)$ https://storage.googleapis.com/kubernetes-release/$1 redirect; } } diff --git a/k8s.io/test.py b/k8s.io/test.py index 4d99cb1d724..7ff1624794e 100755 --- a/k8s.io/test.py +++ b/k8s.io/test.py @@ -296,10 +296,6 @@ def test_dl(self): base + '/ci/latest-$ver.txt', 'https://storage.googleapis.com/k8s-release-dev/ci/latest-$ver.txt', ver=rand_num()) - self.assert_temp_redirect( - base + '/ci-cross/v$ver/$path', - 'https://storage.googleapis.com/k8s-release-dev/ci-cross/v$ver/$path', - ver=rand_num(), path=rand_num()) # Base case self.assert_temp_redirect( base + '/$path',