make loadbalancer tunnel protocol aware

Change-Id: I04adae38af0befe33f22e2d36c18fbdea59e45b5

Author: aojea

pkg/container/container.go

@@ -220,7 +220,7 @@ func PortMaps(name string) (map[string]string, error) {
 		// TODO we just can get the first entry or look for ip families
 		for _, pm := range v {
 			if pm.HostPort != "" {
-				result[parts[0]] = pm.HostPort
+				result[parts[0]+"/"+protocol] = pm.HostPort
 				break
 			}
 		}

pkg/loadbalancer/proxy.go

@@ -327,7 +327,7 @@ func waitLoadBalancerReady(ctx context.Context, name string, timeout time.Durati
 		}
 		authority = net.JoinHostPort(ipv4, strconv.Itoa(envoyAdminPort))
 	} else {
-		port, ok := portmaps[strconv.Itoa(envoyAdminPort)]
+		port, ok := portmaps[strconv.Itoa(envoyAdminPort)+"/tcp"]
 		if !ok {
 			return fmt.Errorf("envoy admin port %d not found, got %v", envoyAdminPort, portmaps)
 		}

pkg/loadbalancer/tunnel.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"strings"
 	"sync"
 
 	"k8s.io/klog/v2"
@@ -49,7 +50,12 @@ func (t *tunnelManager) setupTunnels(containerName string) error {
 	defer t.mu.Unlock()
 	// There is one IP per Service and a tunnel per Service Port
 	for containerPort, hostPort := range portmaps {
-		tun := NewTunnel(ipv4, containerPort, "localhost", hostPort)
+		parts := strings.Split(containerPort, "/")
+		if len(parts) != 2 {
+			return fmt.Errorf("expected format port/protocol for container port, got %s", containerPort)
+		}
+
+		tun := NewTunnel(ipv4, parts[0], parts[1], "localhost", hostPort)
 		// TODO check if we can leak tunnels
 		err = tun.Start()
 		if err != nil {
@@ -95,22 +101,24 @@ type tunnel struct {
 	listener   net.Listener
 	localIP    string
 	localPort  string
+	protocol   string
 	remoteIP   string // address:Port
 	remotePort string
 }
 
-func NewTunnel(localIP, localPort, remoteIP, remotePort string) *tunnel {
+func NewTunnel(localIP, localPort, protocol, remoteIP, remotePort string) *tunnel {
 	return &tunnel{
 		localIP:    localIP,
 		localPort:  localPort,
+		protocol:   protocol,
 		remoteIP:   remoteIP,
 		remotePort: remotePort,
 	}
 }
 
 func (t *tunnel) Start() error {
 	klog.Infof("Starting tunnel on %s", net.JoinHostPort(t.localIP, t.localPort))
-	ln, err := net.Listen("tcp", net.JoinHostPort(t.localIP, t.localPort))
+	ln, err := net.Listen(t.protocol, net.JoinHostPort(t.localIP, t.localPort))
 	if err != nil {
 		return err
 	}
@@ -144,7 +152,7 @@ func (t *tunnel) Stop() error {
 }
 
 func (t *tunnel) handleConnection(local net.Conn) error {
-	remote, err := net.Dial("tcp", net.JoinHostPort(t.remoteIP, t.remotePort))
+	remote, err := net.Dial(t.protocol, net.JoinHostPort(t.remoteIP, t.remotePort))
 	if err != nil {
 		return fmt.Errorf("can't connect to server %q: %v", net.JoinHostPort(t.remoteIP, t.remotePort), err)
 	}