Merge pull request #663 from aledbf/remove-todo

Remove helper required in go < 1.8
kubernetes · Apr 27, 2017 · a1b6fa7 · a1b6fa7
2 parents 192d832 + d1e77f1
commit a1b6fa7
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/core/pkg/ingress/annotations/authreq/main.go b/core/pkg/ingress/annotations/authreq/main.go
@@ -131,22 +131,10 @@ func (a authReq) Parse(ing *extensions.Ingress) (interface{}, error) {
 
 	return &External{
 		URL:             str,
-		Host:            stripPort(ur.Host),
+		Host:            ur.Hostname(),
 		SigninURL:       signin,
 		Method:          m,
 		SendBody:        sb,
 		ResponseHeaders: h,
 	}, nil
 }
-
-// TODO: Remove after upgrade to Go 1.8
-func stripPort(hostport string) string {
-	colon := strings.IndexByte(hostport, ':')
-	if colon == -1 {
-		return hostport
-	}
-	if i := strings.IndexByte(hostport, ']'); i != -1 {
-		return strings.TrimPrefix(hostport[:i], "[")
-	}
-	return hostport[:colon]
-}