diff --git a/kubernetes1.20.changes b/kubernetes1.20.changes index c778d49..0be8ec1 100644 --- a/kubernetes1.20.changes +++ b/kubernetes1.20.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Wed Dec 09 11:49:56 UTC 2020 - rbrown@suse.com +- Rebase opensuse-version-checks.patch - Update to version 1.20.0: * APF e2e: disable drown-out tests temporarily * coredns dep.Severity is newdefault, not newDefault diff --git a/opensuse-version-checks.patch b/opensuse-version-checks.patch index feb486d..3118f2b 100644 --- a/opensuse-version-checks.patch +++ b/opensuse-version-checks.patch @@ -1,11 +1,11 @@ ---- kubernetes-orig/cmd/kubeadm/app/util/version.go 2020-03-16 16:53:48.277941771 +0100 -+++ kubernetes/cmd/kubeadm/app/util/version.go 2020-03-16 17:08:46.753358788 +0100 -@@ -38,7 +38,7 @@ +--- a/cmd/kubeadm/app/util/version.go ++++ b/cmd/kubeadm/app/util/version.go +@@ -38,7 +38,7 @@ const ( ) var ( - kubeReleaseBucketURL = "https://dl.k8s.io" + kubeReleaseBucketURL = "https://kubic.opensuse.org" 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_\.+]+)$`)