From c430d87857835b793dad613960d04bcd9b9170ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Thu, 7 Mar 2024 21:09:00 +0100 Subject: [PATCH] Redirect apt/yum.kubernetes.io to the deprecation announcement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- apps/k8s-io/configmap-nginx.yaml | 2 ++ apps/k8s-io/test.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/k8s-io/configmap-nginx.yaml b/apps/k8s-io/configmap-nginx.yaml index 860cb6326d9..9f18a32c6fc 100644 --- a/apps/k8s-io/configmap-nginx.yaml +++ b/apps/k8s-io/configmap-nginx.yaml @@ -152,6 +152,7 @@ data: server_name apt.kubernetes.io apt.k8s.io; listen 80; + rewrite ^/$ https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/ redirect; rewrite ^/(.*)?$ https://packages.cloud.google.com/apt/$1 redirect; } @@ -159,6 +160,7 @@ data: server_name yum.kubernetes.io yum.k8s.io; listen 80; + rewrite ^/$ https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/ redirect; rewrite ^/(.*)?$ https://packages.cloud.google.com/yum/$1 redirect; } diff --git a/apps/k8s-io/test.py b/apps/k8s-io/test.py index 62728799bd6..090b386aad8 100755 --- a/apps/k8s-io/test.py +++ b/apps/k8s-io/test.py @@ -221,13 +221,13 @@ def test_go(self): def test_yum(self): for base in ('yum.k8s.io', 'yum.kubernetes.io'): - self.assert_temp_redirect(base, 'https://packages.cloud.google.com/yum/') + self.assert_temp_redirect(base, 'https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/') self.assert_temp_redirect(base + '/$id', 'https://packages.cloud.google.com/yum/$id', id=rand_num()) def test_apt(self): for base in ('apt.k8s.io', 'apt.kubernetes.io'): - self.assert_temp_redirect(base, 'https://packages.cloud.google.com/apt/') + self.assert_temp_redirect(base, 'https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/') self.assert_temp_redirect(base + '/$id', 'https://packages.cloud.google.com/apt/$id', id=rand_num())