scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93626 from vikkyomkar/issue-2237

Browse Source 
[Cleanup] Removes usage of the k8s-master label (version marker)
This commit is contained in:
Kubernetes Prow Robot
2020-08-27 11:52:09 -07:00
committed by GitHub
parent 8297d5f195 f505f10e94
commit a39f9dfde7
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/util/version.go
View File

@@ -40,7 +40,7 @@ const (
var (
kubeReleaseBucketURL = "https://dl.k8s.io"
kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`)
kubeReleaseLabelRegex = regexp.MustCompile(`(k8s-master|((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?))\z`)
kubeReleaseLabelRegex = regexp.MustCompile(`^((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?)\z`)
kubeBucketPrefixes = regexp.MustCompile(`^((release|ci|ci-cross)/)?([-\w_\.+]+)$`)
)
@@ -61,7 +61,6 @@ var (
// latest (latest release, including alpha/beta)
// latest-1 (latest release in 1.x, including alpha/beta)
// latest-1.0 (and similarly 1.1, 1.2, 1.3, ...)
// k8s-master (latest cross build)
func KubernetesReleaseVersion(version string) (string, error) {
return kubernetesReleaseVersion(version, fetchFromURL)
}

2
cmd/kubeadm/app/util/version_test.go
View File

@@ -196,7 +196,6 @@ func TestSplitVersion(t *testing.T) {
{"release/latest-1.7", "https://dl.k8s.io/release", "latest-1.7", true},
// CI builds area
{"ci/latest", "https://dl.k8s.io/ci", "latest", true},
{"ci/k8s-master", "https://dl.k8s.io/ci", "k8s-master", true},
{"ci/latest-1.7", "https://dl.k8s.io/ci", "latest-1.7", true},
// unknown label in default (release) area: splitVersion validate only areas.
{"unknown-1", "https://dl.k8s.io/release", "unknown-1", true},
@@ -236,7 +235,6 @@ func TestKubernetesIsCIVersion(t *testing.T) {
{"release/v1.0.0", false},
// CI builds
{"ci/latest-1", true},
{"ci/k8s-master", true},
{"ci/v1.9.0-alpha.1.123+acbcbfd53bfa0a", true},
}