Skip to content

Commit 8cade56

Browse files
committed
Move from bit.ly URLs to rel.k8s.io for the release team
Signed-off-by: Vyom Yadav <[email protected]>
1 parent 6e38cc1 commit 8cade56

File tree

2 files changed

+49
-4
lines changed

2 files changed

+49
-4
lines changed

apps/k8s-io/README.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ Vanity URL(s)
3535

3636
NOTE: please see k8s.io/k8s.io/configmap-nginx.yaml for `server` definitions
3737

38-
Redirections
39-
====
38+
# Redirections
39+
40+
## go.k8s.io Redirects
4041
- https://go.k8s.io/api-review
4142
- https://go.k8s.io/bot-commands
4243
- https://go.k8s.io/calendar
@@ -67,6 +68,33 @@ Redirections
6768
- https://go.k8s.io/contact/wg-lts
6869
- https://go.k8s.io/contact/committee-steering
6970

71+
## rel.k8s.io Redirects
72+
73+
### Direct Redirects
74+
- https://rel.k8s.io/https://github.com/kubernetes/kubernetes/releases
75+
- https://rel.k8s.io/k8s-release-calhttps://calendar.google.com/calendar/embed?src=kipmnllvl17vl9m98jen6ujcrs%40group.calendar.google.com
76+
- https://rel.k8s.io/k8s-sig-release-videoshttps://youtube.com/playlist?list=PL69nYSiGNLP3QKkOsDsO6A0Y1rhgP84iZ&si=Mi095CYuJuz8LjN-
77+
78+
### Version-specific Redirects
79+
80+
#### For versions ≤1.33:
81+
Historical version-specific URLs follow this pattern:
82+
- https://rel.k8s.io/v1XX/{keyword}https://bit.ly/k8s1XX-{keyword}
83+
84+
Examples include:
85+
- https://rel.k8s.io/v133/enhancementshttps://bit.ly/k8s133-enhancements
86+
- https://rel.k8s.io/v133/bugtriagehttps://bit.ly/k8s133-bugtriage
87+
- https://rel.k8s.io/v133/cisignalhttps://bit.ly/k8s133-cisignal
88+
89+
Other common patterns that have been moved to the direct bit.ly redirects:
90+
- https://rel.k8s.io/v1XX/releasemtg
91+
- https://rel.k8s.io/v1XX/retro
92+
- https://rel.k8s.io/v1XX/contacts (Note: Access is restricted through Google Authorization)
93+
94+
#### For versions >1.33:
95+
For all release versions after v1.33, URLs follow this pattern:
96+
- https://rel.k8s.io/v1XX/{keyword}https://github.com/kubernetes/sig-release/tree/master/releases/release-1.XX/links.md#{keyword}
97+
7098

7199
NOTE: please see configmap-nginx.yaml for rewrite rules.
72100

apps/k8s-io/configmap-nginx.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,25 @@ data:
346346
listen 80;
347347
348348
location / {
349-
rewrite ^/$ https://github.com/kubernetes/kubernetes/releases redirect;
350-
rewrite ^/([^/]*)(/.*)?$ https://github.com/kubernetes/kubernetes/tree/$1$2 redirect;
349+
# Special case for versions up to v1.33 - redirect to bit.ly
350+
if ($uri ~ "^/v([0-9])([0-9]+)/([a-zA-Z]+)$") {
351+
set $major $1;
352+
set $minor $2;
353+
set $remaining $3;
354+
355+
# For versions <=1.33, redirect to bit.ly
356+
if ($major = "1" && $minor <= "33") {
357+
return 301 https://bit.ly/k8s$major$minor-$remaining;
358+
}
359+
360+
# For versions >1.33, redirect to links.md in kubernetes/sig-release repo
361+
return 301 https://github.com/kubernetes/sig-release/tree/master/releases/release-$major.$minor/links.md#$remaining;
362+
}
363+
364+
rewrite ^/$ https://github.com/kubernetes/kubernetes/releases redirect;
365+
rewrite ^/k8s-release-cal https://calendar.google.com/calendar/embed?src=kipmnllvl17vl9m98jen6ujcrs%40group.calendar.google.com redirect;
366+
rewrite ^/k8s-sig-release-videos https://youtube.com/playlist?list=PL69nYSiGNLP3QKkOsDsO6A0Y1rhgP84iZ&si=Mi095CYuJuz8LjN- redirect;
367+
rewrite ^/([^/]*)(/.*)?$ https://github.com/kubernetes/kubernetes/tree/$1$2 redirect;
351368
}
352369
}
353370

0 commit comments

Comments
 (0)