Skip to content

K
k3s
Commit c6c82351 authored by Ed Bartosh's avatar Ed Bartosh
Browse files
Options

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.
parent e72c6c69
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
cmd/kubeadm/app/preflight/checks.go
View file @ c6c82351
...@@ -410,7 +410,6 @@ func (hc HostnameCheck) Check() (warnings, errors []error) { ...@@ -410,7 +410,6 @@ func (hc HostnameCheck) Check() (warnings, errors []error) {
type HTTPProxyCheck struct { type HTTPProxyCheck struct {
Proto string Proto string
Host string Host string
Port int
} }
// Name returns HTTPProxy as name for HTTPProxyCheck // Name returns HTTPProxy as name for HTTPProxyCheck
...@@ -421,7 +420,7 @@ func (hst HTTPProxyCheck) Name() string { ...@@ -421,7 +420,7 @@ func (hst HTTPProxyCheck) Name() string {
// Check validates http connectivity type, direct or via proxy. // Check validates http connectivity type, direct or via proxy.
func (hst HTTPProxyCheck) Check() (warnings, errors []error) { 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) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
...@@ -897,7 +896,7 @@ func RunInitMasterChecks(execer utilsexec.Interface, cfg *kubeadmapi.MasterConfi ...@@ -897,7 +896,7 @@ func RunInitMasterChecks(execer utilsexec.Interface, cfg *kubeadmapi.MasterConfi
ControllerManagerExtraArgs: cfg.ControllerManagerExtraArgs, ControllerManagerExtraArgs: cfg.ControllerManagerExtraArgs,
SchedulerExtraArgs: cfg.SchedulerExtraArgs, 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.ServiceSubnet},
HTTPProxyCIDRCheck{Proto: "https", CIDR: cfg.Networking.PodSubnet}, HTTPProxyCIDRCheck{Proto: "https", CIDR: cfg.Networking.PodSubnet},
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment