For k8s, look for mc-router named service port and use port value

itzg · itzg · commit be0f2a8c56ec · 2019-04-25T19:35:42.000-05:00
diff --git a/server/k8s.go b/server/k8s.go
@@ -10,6 +10,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
 	"net"
+	"strconv"
 )
 
 const (
@@ -146,10 +147,8 @@ func buildDetails(service *v1.Service, externalServiceName string) *routableServ
 	clusterIp := service.Spec.ClusterIP
 	port := "25565"
 	for _, p := range service.Spec.Ports {
-		if p.Port == 25565 {
-			if p.TargetPort.String() != "" {
-				port = p.TargetPort.String()
-			}
+		if p.Name == "mc-router" {
+			port = strconv.Itoa(int(p.Port))
 		}
 	}
 	rs := &routableService{

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"k8s.io/client-go/tools/cache"`
`11`	`11`	`"k8s.io/client-go/tools/clientcmd"`
`12`	`12`	`"net"`
	`13`	`+ "strconv"`
`13`	`14`	`)`
`14`	`15`
`15`	`16`	`const (`
`@@ -146,10 +147,8 @@ func buildDetails(service v1.Service, externalServiceName string) routableServ`
`146`	`147`	`clusterIp := service.Spec.ClusterIP`
`147`	`148`	`port := "25565"`
`148`	`149`	`for _, p := range service.Spec.Ports {`
`149`		`- if p.Port == 25565 {`
`150`		`- if p.TargetPort.String() != "" {`
`151`		`- port = p.TargetPort.String()`
`152`		`- }`
	`150`	`+ if p.Name == "mc-router" {`
	`151`	`+ port = strconv.Itoa(int(p.Port))`
`153`	`152`	`}`
`154`	`153`	`}`
`155`	`154`	`rs := &routableService{`