Revert "Allow specifying scheme when proxying"

pkg/util/port_split.go

@@ -18,60 +18,23 @@ package util
 
 import (
 	"strings"
-
-	"k8s.io/kubernetes/pkg/util/sets"
 )
 
-var validSchemes = sets.NewString("http", "https", "")
-
-// SplitSchemeNamePort takes a string of the following forms:
-//  * "<name>",                 returns "",        "<name>","",      true
-//  * "<name>:<port>",          returns "",        "<name>","<port>",true
-//  * "<scheme>:<name>:<port>", returns "<scheme>","<name>","<port>",true
+// Takes a string of the form "name:port" or "name".
+//  * If id is of the form "name" or "name:", then return (name, "", true)
+//  * If id is of the form "name:port", then return (name, port, true)
+//  * Otherwise, return ("", "", false)
+// Additionally, name must be non-empty or valid will be returned false.
 //
-// Name must be non-empty or valid will be returned false.
-// Scheme must be "http" or "https" if specified
 // Port is returned as a string, and it is not required to be numeric (could be
 // used for a named port, for example).
-func SplitSchemeNamePort(id string) (scheme, name, port string, valid bool) {
+func SplitPort(id string) (name, port string, valid bool) {
 	parts := strings.Split(id, ":")
-	switch len(parts) {
-	case 1:
-		name = parts[0]
-	case 2:
-		name = parts[0]
-		port = parts[1]
-	case 3:
-		scheme = parts[0]
-		name = parts[1]
-		port = parts[2]
-	default:
-		return "", "", "", false
+	if len(parts) > 2 {
+		return "", "", false
 	}
-
-	if len(name) > 0 && validSchemes.Has(scheme) {
-		return scheme, name, port, true
-	} else {
-		return "", "", "", false
+	if len(parts) == 2 {
+		return parts[0], parts[1], len(parts[0]) > 0
 	}
-}
-
-// JoinSchemeNamePort returns a string that specifies the scheme, name, and port:
-//  * "<name>"
-//  * "<name>:<port>"
-//  * "<scheme>:<name>:<port>"
-// None of the parameters may contain a ':' character
-// Name is required
-// Scheme must be "", "http", or "https"
-func JoinSchemeNamePort(scheme, name, port string) string {
-	if len(scheme) > 0 {
-		// Must include three segments to specify scheme
-		return scheme + ":" + name + ":" + port
-	}
-	if len(port) > 0 {
-		// Must include two segments to specify port
-		return name + ":" + port
-	}
-	// Return name alone
-	return name
+	return id, "", len(id) > 0
 }