Skip to content

K
k3s
Unverified Commit 444881d0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63595 from dims/automated-cherry-pick-of-#63504-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #63504: Improve where we load builds from for kubeadm upgrade jobs Cherry pick of #63504 on release-1.10. #63504: Improve where we load builds from for kubeadm upgrade jobs ```release-note Fixed where we get latest builds for stable branches ```
parents 8b38505e 9621f7e8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
cmd/kubeadm/app/util/version.go
View file @ 444881d0
......@@ -122,8 +122,8 @@ func splitVersion(version string) (string, string, error) {
switch {
case strings.HasPrefix(subs[0][2], "ci"):
// Special case. CI images populated only by ci-cross area
urlSuffix = "ci-cross"
// Just use whichever the user specified
urlSuffix = subs[0][2]
default:
urlSuffix = "release"
}
......
cmd/kubeadm/app/util/version_test.go
View file @ 444881d0
......@@ -180,8 +180,10 @@ func TestSplitVersion(t *testing.T) {
{"release/v1.7.0", "https://dl.k8s.io/release", "v1.7.0", true},
{"release/latest-1.7", "https://dl.k8s.io/release", "latest-1.7", true},
// CI builds area, lookup actual builds at ci-cross/*.txt
{"ci/latest", "https://dl.k8s.io/ci", "latest", true},
{"ci-cross/latest", "https://dl.k8s.io/ci-cross", "latest", true},
{"ci/latest-1.7", "https://dl.k8s.io/ci-cross", "latest-1.7", true},
{"ci/latest-1.7", "https://dl.k8s.io/ci", "latest-1.7", true},
{"ci-cross/latest-1.7", "https://dl.k8s.io/ci-cross", "latest-1.7", true},
// unknown label in default (release) area: splitVersion validate only areas.
{"unknown-1", "https://dl.k8s.io/release", "unknown-1", true},
// unknown area, not valid input.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment