Bumping k8s dependencies to 1.13

vendor/k8s.io/kubernetes/cmd/kubeadm/app/util/endpoint.go

@@ -27,42 +27,44 @@ import (
 )
 
 // GetMasterEndpoint returns a properly formatted endpoint for the control plane built according following rules:
-// - If the api.ControlPlaneEndpoint is defined, use it.
-// - if the api.ControlPlaneEndpoint is defined but without a port number, use the api.ControlPlaneEndpoint + api.BindPort is used.
-// - Otherwise, in case the api.ControlPlaneEndpoint is not defined, use the api.AdvertiseAddress + the api.BindPort.
-func GetMasterEndpoint(api *kubeadmapi.API) (string, error) {
+// - If the ControlPlaneEndpoint is defined, use it.
+// - if the ControlPlaneEndpoint is defined but without a port number, use the ControlPlaneEndpoint + api.BindPort is used.
+// - Otherwise, in case the ControlPlaneEndpoint is not defined, use the api.AdvertiseAddress + the api.BindPort.
+func GetMasterEndpoint(cfg *kubeadmapi.InitConfiguration) (string, error) {
 	// parse the bind port
-	var bindPort = strconv.Itoa(int(api.BindPort))
-	if _, err := parsePort(bindPort); err != nil {
-		return "", fmt.Errorf("invalid value %q given for api.bindPort: %s", api.BindPort, err)
+	bindPortString := strconv.Itoa(int(cfg.APIEndpoint.BindPort))
+	if _, err := ParsePort(bindPortString); err != nil {
+		return "", fmt.Errorf("invalid value %q given for api.bindPort: %s", cfg.APIEndpoint.BindPort, err)
 	}
 
 	// parse the AdvertiseAddress
-	var ip = net.ParseIP(api.AdvertiseAddress)
+	var ip = net.ParseIP(cfg.APIEndpoint.AdvertiseAddress)
 	if ip == nil {
-		return "", fmt.Errorf("invalid value `%s` given for api.advertiseAddress", api.AdvertiseAddress)
+		return "", fmt.Errorf("invalid value `%s` given for api.advertiseAddress", cfg.APIEndpoint.AdvertiseAddress)
 	}
 
 	// set the master url using cfg.API.AdvertiseAddress + the cfg.API.BindPort
 	masterURL := &url.URL{
 		Scheme: "https",
-		Host:   net.JoinHostPort(ip.String(), bindPort),
+		Host:   net.JoinHostPort(ip.String(), bindPortString),
 	}
 
 	// if the controlplane endpoint is defined
-	if len(api.ControlPlaneEndpoint) > 0 {
+	if len(cfg.ControlPlaneEndpoint) > 0 {
 		// parse the controlplane endpoint
 		var host, port string
 		var err error
-		if host, port, err = ParseHostPort(api.ControlPlaneEndpoint); err != nil {
-			return "", fmt.Errorf("invalid value %q given for api.controlPlaneEndpoint: %s", api.ControlPlaneEndpoint, err)
+		if host, port, err = ParseHostPort(cfg.ControlPlaneEndpoint); err != nil {
+			return "", fmt.Errorf("invalid value %q given for controlPlaneEndpoint: %s", cfg.ControlPlaneEndpoint, err)
 		}
 
 		// if a port is provided within the controlPlaneAddress warn the users we are using it, else use the bindport
 		if port != "" {
-			fmt.Println("[endpoint] WARNING: port specified in api.controlPlaneEndpoint overrides api.bindPort in the controlplane address")
+			if port != bindPortString {
+				fmt.Println("[endpoint] WARNING: port specified in controlPlaneEndpoint overrides bindPort in the controlplane address")
+			}
 		} else {
-			port = bindPort
+			port = bindPortString
 		}
 
 		// overrides the master url using the controlPlaneAddress (and eventually the bindport)
@@ -90,7 +92,7 @@ func ParseHostPort(hostport string) (string, string, error) {
 
 	// if port is defined, parse and validate it
 	if port != "" {
-		if _, err := parsePort(port); err != nil {
+		if _, err := ParsePort(port); err != nil {
 			return "", "", fmt.Errorf("port must be a valid number between 1 and 65535, inclusive")
 		}
 	}
@@ -110,8 +112,9 @@ func ParseHostPort(hostport string) (string, string, error) {
 
 // ParsePort parses a string representing a TCP port.
 // If the string is not a valid representation of a TCP port, ParsePort returns an error.
-func parsePort(port string) (int, error) {
-	if portInt, err := strconv.Atoi(port); err == nil && (1 <= portInt && portInt <= 65535) {
+func ParsePort(port string) (int, error) {
+	portInt, err := strconv.Atoi(port)
+	if err == nil && (1 <= portInt && portInt <= 65535) {
 		return portInt, nil
 	}