fix(*) support enterprise versions (#61)

* fix(*) support enterprise versions

Author: subnetmarco

Makefile

@@ -18,7 +18,7 @@ all: all-container
 BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-TAG?=0.0.4
+TAG?=0.0.5
 REGISTRY?=kong-docker-kubernetes-ingress-controller.bintray.io
 GOOS?=linux
 DOCKER?=docker

cli/ingress-controller/main.go

@@ -144,8 +144,8 @@ func main() {
 		glog.Fatalf("%v", err)
 	}
 
-	if !v.GTE(semver.MustParse("0.13.0")) {
-		glog.Fatalf("The version %s is not compatible with the Kong Ingress Controller. It requires Kong 0.13.0 or higher.", v)
+	if !(v.GTE(semver.MustParse("0.13.0")) || v.GTE(semver.MustParse("0.32.0"))) {
+		glog.Fatalf("The version %s is not compatible with the Kong Ingress Controller. It requires Kong CE 0.13.0 or higher, or Kong EE 0.32 or higher.", v)
 	}
 
 	glog.Infof("kong version: %s", v)

internal/apis/admin/kong_client.go

@@ -138,8 +138,15 @@ func (c *RestClient) GetVersion() (semver.Version, error) {
 
 	if version, ok := info["version"]; ok {
 		v := version.(string)
+		
+		// fix enterprise edition semver adding patch number
+		re := regexp.MustCompile(`([\d\.]+)-enterprise-edition`)
+		if re.MatchString(v) {
+			v = re.ReplaceAllString(v, "$1.0-enterprise")
+		}
+
 		// fix bad version formats like 0.13.0preview1
-		re := regexp.MustCompile(`(.*\d)(preview.*|rc.*)`)
+		re = regexp.MustCompile(`(.*\d)(preview.*|rc.*)`)
 		if re.MatchString(v) {
 			v = re.ReplaceAllString(v, "$1-$2")
 		}