Merge pull request #3065 from aledbf/joinhp

Join host/port with go helper (supports ipv6)
kubernetes · Sep 10, 2018 · 20f770b · 20f770b
2 parents ef2f387 + 361f06b
commit 20f770b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/ingress/controller/endpoints.go b/internal/ingress/controller/endpoints.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"net"
 	"reflect"
+	"strconv"
 
 	"github.com/golang/glog"
 
@@ -100,7 +101,7 @@ func getEndpoints(s *corev1.Service, port *corev1.ServicePort, proto corev1.Prot
 			}
 
 			for _, epAddress := range ss.Addresses {
-				ep := fmt.Sprintf("%v:%v", epAddress.IP, targetPort)
+				ep := net.JoinHostPort(epAddress.IP, strconv.Itoa(int(targetPort)))
 				if _, exists := processedUpstreamServers[ep]; exists {
 					continue
 				}

diff --git a/test/e2e/settings/proxy_protocol.go b/test/e2e/settings/proxy_protocol.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"strconv"
 	"strings"
 
 	. "github.com/onsi/ginkgo"
@@ -66,7 +67,7 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
 		port, err := f.GetNginxPort("http")
 		Expect(err).NotTo(HaveOccurred())
 
-		conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", ip, port))
+		conn, err := net.Dial("tcp", net.JoinHostPort(ip, strconv.Itoa(port)))
 		Expect(err).NotTo(HaveOccurred())
 		defer conn.Close()