Skip to content

Commit 0a0f6f8

Browse files
committed
kubeadm: do not use github.com/blang/semver in app/preflight
Usage of github.com/blang/semver is not needed and k8s.io/apimachinery/pkg/util/version should be used instead for semantic version parsing and version comparison.
1 parent f4521bf commit 0a0f6f8

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

cmd/kubeadm/app/preflight/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ go_library(
3131
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
3232
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
3333
"//vendor/github.com/PuerkitoBio/purell:go_default_library",
34-
"//vendor/github.com/blang/semver:go_default_library",
3534
"//vendor/github.com/pkg/errors:go_default_library",
3635
"//vendor/k8s.io/klog:go_default_library",
3736
"//vendor/k8s.io/utils/exec:go_default_library",

cmd/kubeadm/app/preflight/checks.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"time"
3636

3737
"github.com/PuerkitoBio/purell"
38-
"github.com/blang/semver"
3938
"github.com/pkg/errors"
4039
netutil "k8s.io/apimachinery/pkg/util/net"
4140
"k8s.io/apimachinery/pkg/util/sets"
@@ -65,7 +64,7 @@ const (
6564
)
6665

6766
var (
68-
minExternalEtcdVersion = semver.MustParse(kubeadmconstants.MinExternalEtcdVersion)
67+
minExternalEtcdVersion = versionutil.MustParseSemantic(kubeadmconstants.MinExternalEtcdVersion)
6968
)
7069

7170
// Error defines struct for communicating error messages generated by preflight checks
@@ -722,12 +721,12 @@ func (evc ExternalEtcdVersionCheck) Check() (warnings, errorList []error) {
722721
continue
723722
}
724723

725-
etcdVersion, err := semver.Parse(resp.Etcdserver)
724+
etcdVersion, err := versionutil.ParseSemantic(resp.Etcdserver)
726725
if err != nil {
727726
errorList = append(errorList, errors.Wrapf(err, "couldn't parse external etcd version %q", resp.Etcdserver))
728727
continue
729728
}
730-
if etcdVersion.LT(minExternalEtcdVersion) {
729+
if etcdVersion.LessThan(minExternalEtcdVersion) {
731730
errorList = append(errorList, errors.Errorf("this version of kubeadm only supports external etcd version >= %s. Current version: %s", kubeadmconstants.MinExternalEtcdVersion, resp.Etcdserver))
732731
continue
733732
}

0 commit comments

Comments
 (0)