Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-add production bucket fix to release notes index #3838

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkg/release/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,10 @@ func (p *Publisher) PublishToGcs(
return nil
}

// TODO: remove this function once https://cdn.dl.k8s.io/release/release-notes-index.json
// is fixed.
func FixPublicReleaseNotesURL(gcsPath string) string {
const prefix = "https://storage.googleapis.com/"
for strings.HasPrefix(gcsPath, prefix) {
gcsPath = strings.TrimPrefix(gcsPath, prefix)
const prefix = "gs://" + ProductionBucket
if strings.HasPrefix(gcsPath, prefix) {
gcsPath = ProductionBucketURL + strings.TrimPrefix(gcsPath, prefix)
}
return gcsPath
}
Expand Down
10 changes: 3 additions & 7 deletions pkg/release/publish_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,9 @@ func TestFixPublicReleaseNotesURL(t *testing.T) {
input: "https://dl.k8s.io/release/v1.32.0-beta.0/release-notes.json",
expected: "https://dl.k8s.io/release/v1.32.0-beta.0/release-notes.json",
},
"should fix wrong URL with 1 prefix": {
input: "https://storage.googleapis.com/https://dl.k8s.io/release/v1.32.0-alpha.3/release-notes.json",
expected: "https://dl.k8s.io/release/v1.32.0-alpha.3/release-notes.json",
},
"should fix wrong URL with multiple prefixes": {
input: "https://storage.googleapis.com/https://storage.googleapis.com/https://dl.k8s.io/release/v1.28.1/release-notes.json",
expected: "https://dl.k8s.io/release/v1.28.1/release-notes.json",
"should fix URL referring to production bucket": {
input: "gs://767373bbdcb8270361b96548387bf2a9ad0d48758c35/release/v1.29.11/release-notes.json",
expected: "https://dl.k8s.io/release/v1.29.11/release-notes.json",
},
} {
t.Run(name, func(t *testing.T) {
Expand Down