From dfd83dd78e0a0ee6b1460ed0b5d38beca23044cb4c04b27df616714cda8bdeaf Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 14 Apr 2021 15:04:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.20?expand=0&rev=15 --- kubernetes1.20.spec | 2 +- opensuse-version-checks.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes1.20.spec b/kubernetes1.20.spec index b382e8a..6452de7 100644 --- a/kubernetes1.20.spec +++ b/kubernetes1.20.spec @@ -68,8 +68,8 @@ It groups containers that make up an application into logical units for management and discovery. -# packages to build containerized control plane +# packages to build containerized control plane %package apiserver Summary: Kubernetes apiserver for container image Group: System/Management diff --git a/opensuse-version-checks.patch b/opensuse-version-checks.patch index 679a446..c5a4856 100644 --- a/opensuse-version-checks.patch +++ b/opensuse-version-checks.patch @@ -1,14 +1,14 @@ -From 24cbd72374ad17e73105ff879ec28794c4058235 Mon Sep 17 00:00:00 2001 +From 593f1c479bab59b7c9f11c942b9bb45692d10662 Mon Sep 17 00:00:00 2001 From: Richard Brown -Date: Wed, 14 Apr 2021 16:46:09 +0200 -Subject: [PATCH 337/337] Use kubic.opensuse.org for kubeadm version checks +Date: Wed, 14 Apr 2021 17:03:12 +0200 +Subject: [PATCH] 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 +index a0e9b08bf2b..c693b11ed18 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -38,7 +38,7 @@ const ( @@ -19,7 +19,7 @@ index fcb54dba7fa..648c6caed6c 100644 + 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(`(k8s-master|((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?))\z`) + kubeReleaseLabelRegex = regexp.MustCompile(`^((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?)\z`) -- 2.31.1