github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81622 from neolit123/kubeadm-remove-blang

Browse Source 
kubeadm: do not use github.com/blang/semver in app/preflight
This commit is contained in:
Kubernetes Prow Robot 2019-08-20 10:47:28 -07:00 committed by GitHub
commit f17b608157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/preflight/BUILD
View File

@ -31,7 +31,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
"//vendor/github.com/PuerkitoBio/purell:go_default_library", "//vendor/github.com/PuerkitoBio/purell:go_default_library",
"//vendor/github.com/blang/semver:go_default_library",
"//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/pkg/errors:go_default_library",
"//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library",

7
cmd/kubeadm/app/preflight/checks.go
View File

@ -35,7 +35,6 @@ import (
"time" "time"
"github.com/PuerkitoBio/purell" "github.com/PuerkitoBio/purell"
"github.com/blang/semver"
"github.com/pkg/errors" "github.com/pkg/errors"
netutil "k8s.io/apimachinery/pkg/util/net" netutil "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@ -65,7 +64,7 @@ const (
) )
var ( var (
minExternalEtcdVersion = semver.MustParse(kubeadmconstants.MinExternalEtcdVersion) minExternalEtcdVersion = versionutil.MustParseSemantic(kubeadmconstants.MinExternalEtcdVersion)
) )
// Error defines struct for communicating error messages generated by preflight checks // Error defines struct for communicating error messages generated by preflight checks
@ -725,12 +724,12 @@ func (evc ExternalEtcdVersionCheck) Check() (warnings, errorList []error) {
continue continue
} }
etcdVersion, err := semver.Parse(resp.Etcdserver) etcdVersion, err := versionutil.ParseSemantic(resp.Etcdserver)
if err != nil { if err != nil {
errorList = append(errorList, errors.Wrapf(err, "couldn't parse external etcd version %q", resp.Etcdserver)) errorList = append(errorList, errors.Wrapf(err, "couldn't parse external etcd version %q", resp.Etcdserver))
continue continue
} }
if etcdVersion.LT(minExternalEtcdVersion) { if etcdVersion.LessThan(minExternalEtcdVersion) {
errorList = append(errorList, errors.Errorf("this version of kubeadm only supports external etcd version >= %s. Current version: %s", kubeadmconstants.MinExternalEtcdVersion, resp.Etcdserver)) errorList = append(errorList, errors.Errorf("this version of kubeadm only supports external etcd version >= %s. Current version: %s", kubeadmconstants.MinExternalEtcdVersion, resp.Etcdserver))
continue continue
} }