-
Notifications
You must be signed in to change notification settings - Fork 558
Conversation
6946766
to
dc54b0a
Compare
dc54b0a
to
e644a9f
Compare
replace Masterminds/semver by blang/semver update vendor replace semver in validate fix bug in LT and GT functions fix prelease UT fix false unit test expectations remove hardcoded test fix lint
e644a9f
to
45f14bd
Compare
Codecov Report
@@ Coverage Diff @@
## master #3184 +/- ##
==========================================
+ Coverage 52.31% 52.36% +0.05%
==========================================
Files 103 103
Lines 15458 15426 -32
==========================================
- Hits 8087 8078 -9
+ Misses 6643 6621 -22
+ Partials 728 727 -1 |
45f14bd
to
cbac3f4
Compare
1287892
to
9479f8f
Compare
pkg/api/types.go
Outdated
@@ -859,8 +859,8 @@ func (o *OrchestratorProfile) GetAPIServerEtcdAPIVersion() string { | |||
ret := "etcd3" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's change this entire function to:
etcdversion, _ := semver.Make(o.KubernetesConfig.EtcdVersion)
return "etcd" + etcdversion.Major
pkg/api/vlabs/validate.go
Outdated
@@ -149,17 +149,15 @@ func (o *OrchestratorProfile) Validate(isUpdate, HasWindows bool) error { | |||
return err | |||
} | |||
minVersion := "1.7.0" | |||
cons, _ := semver.Make(minVersion) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change these two lines to:
minVersion, _ := semver.Make("1.7.0")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And then use minVersion
below in place of cons
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also return errors when it's practical
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon, jackfrancis The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
What this PR does / why we need it: The Masterminds semver package has a bug when comparing pre-release versions, use github.com/blang/semver instead.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
If applicable:
Release note: