Remove port from HTTPProxyCheck

This check doesn't use port. It uses proxy related variables (HTTP_PROXY, NO_PROXY, etc) that only operate with protocol and host. Removing port from the check should make it more clear for user that port is not used as it will not be present in the check output.

Remove port from HTTPProxyCheck
c6c82351 · Ed Bartosh · e72c6c69 · c6c82351
Commit c6c82351 authored Jan 30, 2018 by Ed Bartosh
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

checks.go cmd/kubeadm/app/preflight/checks.go +2 -3

No files found.
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -410,7 +410,6 @@ func (hc HostnameCheck) Check() (warnings, errors []error) {
 type HTTPProxyCheck struct {
 	Proto string
 	Host  string
-	Port  int
 }

 // Name returns HTTPProxy as name for HTTPProxyCheck
@@ -421,7 +420,7 @@ func (hst HTTPProxyCheck) Name() string {
 // Check validates http connectivity type, direct or via proxy.
 func (hst HTTPProxyCheck) Check() (warnings, errors []error) {

-	url := fmt.Sprintf("%s://%s:%d", hst.Proto, hst.Host, hst.Port)
+	url := fmt.Sprintf("%s://%s", hst.Proto, hst.Host)

 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -897,7 +896,7 @@ func RunInitMasterChecks(execer utilsexec.Interface, cfg *kubeadmapi.MasterConfi
 			ControllerManagerExtraArgs: cfg.ControllerManagerExtraArgs,
 			SchedulerExtraArgs:         cfg.SchedulerExtraArgs,
 		},
-		HTTPProxyCheck{Proto: "https", Host: cfg.API.AdvertiseAddress, Port: int(cfg.API.BindPort)},
+		HTTPProxyCheck{Proto: "https", Host: cfg.API.AdvertiseAddress},
 		HTTPProxyCIDRCheck{Proto: "https", CIDR: cfg.Networking.ServiceSubnet},
 		HTTPProxyCIDRCheck{Proto: "https", CIDR: cfg.Networking.PodSubnet},
 	}