- Rebase opensuse-version-checks.patch

OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.20?expand=0&rev=14

kubernetes1.20.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 14 14:54:45 UTC 2021 - Richard Brown <rbrown@suse.com>
+
+- Rebase opensuse-version-checks.patch 
+
 -------------------------------------------------------------------
 Tue Apr 13 13:44:57 UTC 2021 - rbrown@suse.com
 

kubernetes1.20.spec

@@ -69,6 +69,7 @@ for management and discovery.
 
 
 # packages to build containerized control plane
+
 %package apiserver
 Summary:        Kubernetes apiserver for container image
 Group:          System/Management

opensuse-version-checks.patch

@@ -1,3 +1,14 @@
+From 24cbd72374ad17e73105ff879ec28794c4058235 Mon Sep 17 00:00:00 2001
+From: Richard Brown <rbrownccb@opensuse.org>
+Date: Wed, 14 Apr 2021 16:46:09 +0200
+Subject: [PATCH 337/337] Use kubic.opensuse.org for kubeadm version checks
+
+---
+ cmd/kubeadm/app/util/version.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go
+index fcb54dba7fa..648c6caed6c 100644
 --- a/cmd/kubeadm/app/util/version.go
 +++ b/cmd/kubeadm/app/util/version.go
 @@ -38,7 +38,7 @@ const (
@@ -6,6 +17,9 @@
  var (
 -	kubeReleaseBucketURL  = "https://dl.k8s.io"
 +	kubeReleaseBucketURL  = "https://kubic.opensuse.org"
+ 	kubeCIBucketURL       = "https://storage.googleapis.com/k8s-release-dev"
  	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(`^((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?)\z`)
+ 	kubeReleaseLabelRegex = regexp.MustCompile(`(k8s-master|((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?))\z`)
- 	kubeBucketPrefixes    = regexp.MustCompile(`^((release|ci|ci-cross)/)?([-\w_\.+]+)$`)
+-- 
+2.31.1
+