From f505f10e94d1e4798feac176ec5189c3fd062105 Mon Sep 17 00:00:00 2001 From: vikkyomkar Date: Sat, 1 Aug 2020 15:52:18 +0530 Subject: [PATCH] removed k8s-master label --- cmd/kubeadm/app/util/version.go | 3 +-- cmd/kubeadm/app/util/version_test.go | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go index 016f835d1bc..9ac0cc7d00c 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -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) } diff --git a/cmd/kubeadm/app/util/version_test.go b/cmd/kubeadm/app/util/version_test.go index 30dad9d0ee9..527ca18bce3 100644 --- a/cmd/kubeadm/app/util/version_test.go +++ b/cmd/kubeadm/app/util/version_test.go @@ -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}, }