K8s Version Comparison Fix (#437)

* Modifying the way we compare k8s version so that we don't fail versions with hotfix / pre-release tag

* cleaning build directory

Author: jaer-tsun

Gopkg.lock

@@ -65,6 +65,10 @@
   name = "github.com/microsoft/ApplicationInsights-Go"
   revision = "d813d7725313000ad1b71627b8951323635f0572"
 
+[[constraint]]
+  name = "github.com/Masterminds/semver"
+  version = "3.0.2"
+
 [prune]
   go-tests = true
   unused-packages = true

Gopkg.toml

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"hash/fnv"
 	"os"
-	"strconv"
 	"strings"
 	"sort"
 
+	"github.com/Masterminds/semver"
 	"k8s.io/apimachinery/pkg/version"
 )
 
@@ -98,43 +98,16 @@ func GetHashedName(name string) string {
 // returns -1, 0, 1 if firstVer smaller, equals, bigger than secondVer respectively.
 // returns -2 for error.
 func CompareK8sVer(firstVer *version.Info, secondVer *version.Info) int {
-	firstMajor, err := strconv.Atoi(firstVer.Major)
+	v1, err := semver.NewVersion(firstVer.Major+firstVer.Minor)
 	if err != nil {
 		return -2
 	}
-
-	firstMinor, err := strconv.Atoi(firstVer.Minor)
-	if err != nil {
-		return -2
-	}
-
-	secondMajor, err := strconv.Atoi(secondVer.Major)
-	if err != nil {
-		return -2
-	}
-
-	secondMinor, err := strconv.Atoi(secondVer.Minor)
+	v2, err := semver.NewVersion(secondVer.Major+secondVer.Minor)
 	if err != nil {
 		return -2
 	}
 
-	if firstMajor < secondMajor {
-		return -1
-	}
-
-	if firstMajor > secondMajor {
-		return 1
-	}
-
-	if firstMinor < secondMinor {
-		return -1
-	}
-
-	if firstMinor > secondMinor {
-		return 1
-	}
-
-	return 0
+	return v1.Compare(v2)
 }
 
 // IsNewNwPolicyVer checks if the current k8s version >= 1.11,

npm/util/util.go

@@ -97,6 +97,20 @@ func TestCompareK8sVer(t *testing.T) {
 	if res := CompareK8sVer(firstVer, secondVer); res != 1 {
 		t.Errorf("TestCompareK8sVer failed @ firstVer > secondVer")
 	}
+
+	firstVer = &version.Info{
+		Major: "1",
+		Minor: "14.8-hotfix.20191113",
+	}
+	
+	secondVer = &version.Info{
+		Major: "1",
+		Minor: "11",
+	}
+	
+	if res := CompareK8sVer(firstVer, secondVer); res != 1 {
+		t.Errorf("TestCompareK8sVer failed @ firstVer > secondVer w/ hotfix tag/pre-release")
+	}
 }
 
 func TestIsNewNwPolicyVer(t *testing.T) {