github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36678 from ymqytw/fix_bug_in_patch 

Automatic merge from submit-queue

fix bug when compare version

Fix a small bug when compare version in `patch` which is introduced by my PR #35647 today.

This blocks #36672.

cc: @janetkuo
pull/6/head
Kubernetes Submit Queue 2016-11-11 23:12:13 -08:00 committed by GitHub
parent 76f99d726c af8fbc327d
commit 68a7c2c6b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/strategicpatch/patch.go
View File

@ -1442,7 +1442,7 @@ func GetServerSupportedSMPatchVersion(discoveryClient discovery.DiscoveryInterfa
if serverGitVersion >= string(SMPatchVersion_1_5) {
return SMPatchVersion_1_5, nil
}
if serverGitVersion >= string(SMPatchVersion_1_5) {
if serverGitVersion >= string(SMPatchVersion_1_0) {
return SMPatchVersion_1_0, nil
}
return Unknown, fmt.Errorf("The version is too old: %v\n", serverVersion)