Allow client version to be 1 minor version greater than server version (

#50)

* Allow client version to be 1 minor version greater than server version

Fixes #49

* Add additional test case

kube/client.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"math"
 	"os/exec"
 	"regexp"
 	"strconv"
@@ -122,7 +123,7 @@ func isCompatible(clientMajor, clientMinor, serverMajor, serverMinor string) err
 	}
 
 	minorDiff := serverMinorInt - clientMinorInt
-	if minorDiff != 0 && minorDiff != 1 {
+	if math.Abs(float64(minorDiff)) > 1 {
 		return incompatible
 	}
 	return nil

kube/client_test.go

@@ -2,8 +2,9 @@ package kube
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 type testCase struct {
@@ -36,8 +37,12 @@ func TestClientIsCompatible(t *testing.T) {
 	tc = testCase{"1", "0", "1", "2", fmt.Errorf("Error: kubectl client and server versions are incompatible. Client is 1.0; server is 1.2. Client must be same minor release as server or one minor release behind server.")}
 	createAndAssert(t, tc)
 
+	// Client 1.2, Server 1.0
+	tc = testCase{"1", "2", "1", "0", fmt.Errorf("Error: kubectl client and server versions are incompatible. Client is 1.2; server is 1.0. Client must be same minor release as server or one minor release behind server.")}
+	createAndAssert(t, tc)
+
 	// Client 1.1, Server 1.0
-	tc = testCase{"1", "1", "1", "0", fmt.Errorf("Error: kubectl client and server versions are incompatible. Client is 1.1; server is 1.0. Client must be same minor release as server or one minor release behind server.")}
+	tc = testCase{"1", "1", "1", "0", nil}
 	createAndAssert(t, tc)
 
 	// Client 1.1, Server 1.1+
@@ -53,7 +58,7 @@ func TestClientIsCompatible(t *testing.T) {
 	createAndAssert(t, tc)
 
 	// Client 1.2, Server 1.1+
-	tc = testCase{"1", "2", "1", "1+", fmt.Errorf("Error: kubectl client and server versions are incompatible. Client is 1.2; server is 1.1+. Client must be same minor release as server or one minor release behind server.")}
+	tc = testCase{"1", "2", "1", "1+", nil}
 	createAndAssert(t, tc)
 }