From 0c5299c9518173e69d90b1a1fed6870f0fa92494 Mon Sep 17 00:00:00 2001
From: Vladimir Varankin <vladimir@varank.in>
Date: Sat, 14 Dec 2019 22:45:41 +0100
Subject: [PATCH] pkg/agent/tunnel: respect ipv6 when building proxy addresses

---
 pkg/agent/tunnel/tunnel.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/agent/tunnel/tunnel.go b/pkg/agent/tunnel/tunnel.go
index d219236b29..5093ca1a9c 100644
--- a/pkg/agent/tunnel/tunnel.go
+++ b/pkg/agent/tunnel/tunnel.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net"
 	"reflect"
+	"strconv"
 	"sync"
 	"time"
 
@@ -37,14 +38,13 @@ func getAddresses(endpoint *v1.Endpoints) []string {
 	for _, subset := range endpoint.Subsets {
 		var port string
 		if len(subset.Ports) > 0 {
-			port = fmt.Sprint(subset.Ports[0].Port)
+			port = strconv.Itoa(int(subset.Ports[0].Port))
+		}
+		if port == "" {
+			port = "443"
 		}
 		for _, address := range subset.Addresses {
-			serverAddress := address.IP
-			if port != "" {
-				serverAddress += ":" + port
-			}
-			serverAddresses = append(serverAddresses, serverAddress)
+			serverAddresses = append(serverAddresses, net.JoinHostPort(address.IP, port))
 		}
 	}
 	return serverAddresses