github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Move GetHostname() from k/k/pkg/util/node to k/component-helpers/node/util

Browse Source 
In fact, this actually uses pkg/util/node's GetHostname() but takes
the unit tests from cmd/kubeadm/app/util's private fork of that
function since they were more extensive. (Of course the fact that
kubeadm had a private fork of this function is a strong argument for
moving it to component-helpers.)
This commit is contained in:
Dan Winship
2023-01-26 09:27:21 -05:00
parent d29e3bd7aa
commit f994ae2521
10 changed files with 19 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kube-proxy/app/server_others.go
View File

@@ -46,6 +46,7 @@ import (
toolswatch "k8s.io/client-go/tools/watch"
"k8s.io/component-base/configz"
"k8s.io/component-base/metrics"
nodeutil "k8s.io/component-helpers/node/util"
utilsysctl "k8s.io/component-helpers/node/util/sysctl"
"k8s.io/kubernetes/pkg/proxy"
proxyconfigapi "k8s.io/kubernetes/pkg/proxy/apis/config"
@@ -59,7 +60,6 @@ import (
utilipset "k8s.io/kubernetes/pkg/util/ipset"
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
utilipvs "k8s.io/kubernetes/pkg/util/ipvs"
utilnode "k8s.io/kubernetes/pkg/util/node"
"k8s.io/utils/exec"
netutils "k8s.io/utils/net"
@@ -96,7 +96,7 @@ func newProxyServer(
metrics.SetShowHidden()
}
hostname, err := utilnode.GetHostname(config.HostnameOverride)
hostname, err := nodeutil.GetHostname(config.HostnameOverride)
if err != nil {
return nil, err
}

4
cmd/kube-proxy/app/server_windows.go
View File

@@ -36,13 +36,13 @@ import (
"k8s.io/client-go/tools/events"
"k8s.io/component-base/configz"
"k8s.io/component-base/metrics"
nodeutil "k8s.io/component-helpers/node/util"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/proxy"
proxyconfigapi "k8s.io/kubernetes/pkg/proxy/apis/config"
proxyconfigscheme "k8s.io/kubernetes/pkg/proxy/apis/config/scheme"
"k8s.io/kubernetes/pkg/proxy/healthcheck"
"k8s.io/kubernetes/pkg/proxy/winkernel"
utilnode "k8s.io/kubernetes/pkg/util/node"
)
// NewProxyServer returns a new ProxyServer.
@@ -71,7 +71,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string
}
// Create event recorder
hostname, err := utilnode.GetHostname(config.HostnameOverride)
hostname, err := nodeutil.GetHostname(config.HostnameOverride)
if err != nil {
return nil, err
}