github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 20:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101161 from rikatz/move-sysctl-util

Browse Source 
Move node and networking related helpers from pkg/util to component helpers
This commit is contained in:
Kubernetes Prow Robot
2021-09-17 02:11:00 -07:00
committed by GitHub
parent 9918aa1e03 37d11bcdaf
commit cb2ea4bf7c
15 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-proxy/app/conntrack.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/mount-utils"
"k8s.io/kubernetes/pkg/util/sysctl"
"k8s.io/component-helpers/node/utils/sysctl"
)
// Conntracker is an interface to the global sysctl. Descriptions of the various

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

@@ -49,6 +49,7 @@ import (
toolswatch "k8s.io/client-go/tools/watch"
"k8s.io/component-base/configz"
"k8s.io/component-base/metrics"
utilsysctl "k8s.io/component-helpers/node/utils/sysctl"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/proxy"
proxyconfigapi "k8s.io/kubernetes/pkg/proxy/apis/config"
@@ -63,7 +64,6 @@ import (
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
utilipvs "k8s.io/kubernetes/pkg/util/ipvs"
utilnode "k8s.io/kubernetes/pkg/util/node"
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
"k8s.io/utils/exec"
netutils "k8s.io/utils/net"