github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pkg/agent/tunnel: respect ipv6 when building proxy addresses

pull/1198/head
Vladimir Varankin 2019-12-14 22:45:41 +01:00
parent ab273a7f1c
commit 0c5299c951
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/agent/tunnel/tunnel.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"net" "net"
"reflect" "reflect"
"strconv"
"sync" "sync"
"time" "time"
@ -37,14 +38,13 @@ func getAddresses(endpoint *v1.Endpoints) []string {
for _, subset := range endpoint.Subsets { for _, subset := range endpoint.Subsets {
var port string var port string
if len(subset.Ports) > 0 { 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 { for _, address := range subset.Addresses {
serverAddress := address.IP serverAddresses = append(serverAddresses, net.JoinHostPort(address.IP, port))
if port != "" {
serverAddress += ":" + port
}
serverAddresses = append(serverAddresses, serverAddress)
} }
} }
return serverAddresses return serverAddresses