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

Merge pull request #36678 from ymqytw/fix_bug_in_patch
68a7c2c6 · Kubernetes Submit Queue · GitHub · 76f99d72 · af8fbc32 · 68a7c2c6
Commit 68a7c2c6 authored Nov 11, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

patch.go pkg/util/strategicpatch/patch.go +1 -1

No files found.
--- a/pkg/util/strategicpatch/patch.go
+++ b/pkg/util/strategicpatch/patch.go
@@ -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)