Update versions of inlets proxies

OSS version is bumped, no breaking changes, tested e2e on
DigitalOcean, with newer inletsctl revision.

PRO version contains breaking changes.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

Author: alexellis

chart/inlets-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: inlets-operator for Kubernetes
 name: inlets-operator
-version: 0.8.7
+version: 0.8.8
 keywords:
 - networking
 - tunnels

chart/inlets-operator/values.yaml

@@ -30,8 +30,8 @@ annotatedOnly: false
 
 image: "inlets/inlets-operator:0.8.6"
 pullPolicy: "IfNotPresent"
-clientImage: "inlets/inlets:2.7.3"
-proClientImage: "inlets/inlets-pro:0.6.0"
+clientImage: "inlets/inlets:2.7.4"
+proClientImage: "inlets/inlets-pro:0.7.0"
 
 nameOverride: ""
 fullnameOverride: ""

controller.go

@@ -668,31 +668,33 @@ func makeClient(tunnel *inletsv1alpha1.Tunnel, targetPort int32, clientImage str
 	name := tunnel.Name + "-client"
 	var container corev1.Container
 
-	if !usePro {
+	if usePro {
 		container = corev1.Container{
 			Name:            "client",
 			Image:           clientImage,
-			Command:         []string{"inlets"},
+			Command:         []string{"inlets-pro"},
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Args: []string{
 				"client",
-				"--upstream=" + fmt.Sprintf("http://%s:%d", tunnel.Spec.ServiceName, targetPort),
-				"--remote=" + fmt.Sprintf("ws://%s:%d", tunnel.Status.HostIP, inletsOSSControlPort),
+				"--url=" + fmt.Sprintf("wss://%s:%d/connect", tunnel.Status.HostIP, inletsPROControlPort),
 				"--token=" + tunnel.Spec.AuthToken,
+				"--upstream=" + tunnel.Spec.ServiceName,
+				"--ports=" + ports,
+				"--license=" + license,
 			},
 		}
+
 	} else {
 		container = corev1.Container{
 			Name:            "client",
 			Image:           clientImage,
-			Command:         []string{"inlets-pro"},
+			Command:         []string{"inlets"},
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Args: []string{
 				"client",
-				"--connect=" + fmt.Sprintf("wss://%s:%d/connect", tunnel.Status.HostIP, inletsPROControlPort),
+				"--upstream=" + fmt.Sprintf("http://%s:%d", tunnel.Spec.ServiceName, targetPort),
+				"--remote=" + fmt.Sprintf("ws://%s:%d", tunnel.Status.HostIP, inletsOSSControlPort),
 				"--token=" + tunnel.Spec.AuthToken,
-				"--tcp-ports=" + ports,
-				"--license=" + license,
 			},
 		}
 	}

go.mod

@@ -6,7 +6,8 @@ go 1.13
 
 require (
 	github.com/aws/aws-sdk-go v1.27.3 // indirect
-	github.com/inlets/inletsctl v0.0.0-20200827135227-594b78220d6e
+	github.com/inlets/inletsctl v0.0.0-20200827152430-ac28a1e46c51
+
 	github.com/sethvargo/go-password v0.2.0
 
 	k8s.io/api v0.18.3

go.sum

@@ -157,10 +157,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inlets/inletsctl v0.0.0-20200630123138-2af07d807845 h1:kXLRUtZf8bxoFJwmiBvBWFgu06nkLXu3YbNpPHnIyUc=
-github.com/inlets/inletsctl v0.0.0-20200630123138-2af07d807845/go.mod h1:TYXLQgu6kEQAH+X2TgZclvJ1h+QK7cJaoPGfkfIr9KI=
-github.com/inlets/inletsctl v0.0.0-20200827135227-594b78220d6e h1:CoeGECUzZGIy++iHIhAiymPzJ7iEVBw6OIKR+liHlH0=
-github.com/inlets/inletsctl v0.0.0-20200827135227-594b78220d6e/go.mod h1:QJ7kj0pyEPAsdYWAdhfWfN5mErQ0Qp+7M3s4u//CMN4=
+github.com/inlets/inletsctl v0.0.0-20200827152430-ac28a1e46c51 h1:5dAO9CtLwMtwjVpqQXNMiE5F8GVuxJ7uK9Fqsop/Dkc=
+github.com/inlets/inletsctl v0.0.0-20200827152430-ac28a1e46c51/go.mod h1:QJ7kj0pyEPAsdYWAdhfWfN5mErQ0Qp+7M3s4u//CMN4=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -310,6 +308,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 h1:HmbHVPwrPEKPGLAcHSrMe6+hqSUlvZU0rab6x5EXfGU=
 golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU=
 golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

image_test.go

@@ -6,7 +6,7 @@ func Test_GetInletsClientImage_DefaultOSSNoOverride(t *testing.T) {
 
 	c := InfraConfig{}
 	got := c.GetInletsClientImage()
-	want := "inlets/inlets:2.7.2"
+	want := "inlets/inlets:2.7.4"
 	if got != want {
 		t.Errorf("for OSS variant want %s, but got %s", want, got)
 		t.Fail()
@@ -22,7 +22,7 @@ func Test_GetInletsClientImage_DefaultProNoOverride(t *testing.T) {
 	}
 
 	got := c.GetInletsClientImage()
-	want := "inlets/inlets-pro:0.6.0"
+	want := "inlets/inlets-pro:0.7.0"
 	if got != want {
 		t.Errorf("for OSS variant want %s, but got %s", want, got)
 		t.Fail()

main.go

@@ -54,9 +54,23 @@ func (i InfraConfig) UsePro() bool {
 
 type InletsProConfig struct {
 	License     string
+	LicenseFile string
 	ClientImage string
 }
 
+func (c InletsProConfig) GetLicenseKey() (string, error) {
+	if len(c.License) > 0 {
+		return c.License, nil
+	}
+
+	body, err := ioutil.ReadFile(c.LicenseFile)
+	if err != nil {
+		return "", fmt.Errorf("error with GetLicenseKey: %s", err.Error())
+	}
+
+	return string(body), nil
+}
+
 func init() {
 	flag.StringVar(&kubeconfig, "kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
 	flag.StringVar(&masterURL, "master", "", "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.")
@@ -77,6 +91,7 @@ func main() {
 	flag.StringVar(&infra.OrganizationID, "organization-id", "", "The organization id if using Scaleway as the provider")
 	flag.StringVar(&infra.ProjectID, "project-id", "", "The project ID if using Packet.com, or Google Compute Engine as the provider")
 	flag.StringVar(&infra.ProConfig.License, "license", "", "Supply a license for use with inlets-pro")
+	flag.StringVar(&infra.ProConfig.LicenseFile, "license-file", "", "Supply a file to read for the inlets-pro license")
 	flag.StringVar(&infra.ProConfig.ClientImage, "pro-client-image", "", "Supply a Docker image for the inlets-pro client")
 	flag.StringVar(&infra.MaxClientMemory, "max-client-memory", "128Mi", "Maximum memory limit for the tunnel clients")
 
@@ -89,10 +104,20 @@ func main() {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 	}
+
 	infra.InletsClientImage = os.Getenv("client_image")
 
 	log.Printf("Inlets client: %s\n", infra.GetInletsClientImage())
-	log.Printf("Inlets pro: %v\n", infra.UsePro())
+
+	pro := infra.UsePro()
+
+	if pro {
+		log.Printf("Using inlets PRO.\n")
+		_, err := infra.ProConfig.GetLicenseKey()
+		if err != nil {
+			panic(err)
+		}
+	}
 
 	// set up signals so we handle the first shutdown signal gracefully
 	stopCh := signals.SetupSignalHandler()
@@ -135,13 +160,13 @@ func main() {
 func (i *InfraConfig) GetInletsClientImage() string {
 	if i.UsePro() {
 		if i.ProConfig.ClientImage == "" {
-			return "inlets/inlets-pro:0.6.0"
+			return "inlets/inlets-pro:0.7.0"
 		}
 		return i.ProConfig.ClientImage
 	}
 
 	if i.InletsClientImage == "" {
-		return "inlets/inlets:2.7.2"
+		return "inlets/inlets:2.7.4"
 	}
 
 	return i.InletsClientImage