From 37d11bcdaf36ce786acf748d3b1496d914413799 Mon Sep 17 00:00:00 2001 From: Ricardo Pchevuzinske Katz Date: Thu, 15 Apr 2021 18:16:18 -0300 Subject: [PATCH] Move node and networking related helpers from pkg/util to component helpers Signed-off-by: Ricardo Katz --- cmd/kube-proxy/app/conntrack.go | 2 +- cmd/kube-proxy/app/server_others.go | 2 +- cmd/kubemark/hollow-node.go | 2 +- pkg/kubelet/cm/container_manager_linux.go | 2 +- pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go | 2 +- pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go | 2 +- pkg/kubelet/dockershim/network/plugins.go | 2 +- pkg/kubelet/dockershim/network/testing/plugins_test.go | 2 +- pkg/kubemark/hollow_proxy.go | 2 +- pkg/proxy/iptables/proxier.go | 2 +- pkg/proxy/ipvs/proxier.go | 2 +- pkg/proxy/util/utils.go | 2 +- .../src/k8s.io/component-helpers/node/utils}/sysctl/sysctl.go | 0 .../k8s.io/component-helpers/node/utils}/sysctl/testing/fake.go | 2 +- vendor/modules.txt | 2 ++ 15 files changed, 15 insertions(+), 13 deletions(-) rename {pkg/util => staging/src/k8s.io/component-helpers/node/utils}/sysctl/sysctl.go (100%) rename {pkg/util => staging/src/k8s.io/component-helpers/node/utils}/sysctl/testing/fake.go (96%) diff --git a/cmd/kube-proxy/app/conntrack.go b/cmd/kube-proxy/app/conntrack.go index faca96c611a..21c48691df7 100644 --- a/cmd/kube-proxy/app/conntrack.go +++ b/cmd/kube-proxy/app/conntrack.go @@ -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 diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index 399c4261c2e..4c7cec752a7 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -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" diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 8aa6115e52d..e0a1e6974a1 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -42,6 +42,7 @@ import ( _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" + fakesysctl "k8s.io/component-helpers/node/utils/sysctl/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/cluster/ports" @@ -51,7 +52,6 @@ import ( fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" "k8s.io/kubernetes/pkg/kubemark" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" - fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing" utiltaints "k8s.io/kubernetes/pkg/util/taints" fakeexec "k8s.io/utils/exec/testing" ) diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index c70a3f4f1a7..1c39e3d7d07 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -48,6 +48,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" internalapi "k8s.io/cri-api/pkg/apis" podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1" kubefeatures "k8s.io/kubernetes/pkg/features" @@ -70,7 +71,6 @@ import ( schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/procfs" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" ) const ( diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go index 852fe73928d..658ab3f2957 100644 --- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go @@ -36,6 +36,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" utilnet "k8s.io/apimachinery/pkg/util/net" utilsets "k8s.io/apimachinery/pkg/util/sets" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" "k8s.io/klog/v2" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -43,7 +44,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" "k8s.io/kubernetes/pkg/util/bandwidth" utiliptables "k8s.io/kubernetes/pkg/util/iptables" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" utilebtables "k8s.io/utils/net/ebtables" diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go index 0fba86638e7..f71f9c8c075 100644 --- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go @@ -31,6 +31,7 @@ import ( "github.com/stretchr/testify/mock" utilsets "k8s.io/apimachinery/pkg/util/sets" + sysctltest "k8s.io/component-helpers/node/utils/sysctl/testing" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" @@ -38,7 +39,6 @@ import ( nettest "k8s.io/kubernetes/pkg/kubelet/dockershim/network/testing" "k8s.io/kubernetes/pkg/util/bandwidth" ipttest "k8s.io/kubernetes/pkg/util/iptables/testing" - sysctltest "k8s.io/kubernetes/pkg/util/sysctl/testing" "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" netutils "k8s.io/utils/net" diff --git a/pkg/kubelet/dockershim/network/plugins.go b/pkg/kubelet/dockershim/network/plugins.go index c87dcca4ad6..1025ee188e4 100644 --- a/pkg/kubelet/dockershim/network/plugins.go +++ b/pkg/kubelet/dockershim/network/plugins.go @@ -31,12 +31,12 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" utilsets "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" "k8s.io/klog/v2" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/metrics" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" netutils "k8s.io/utils/net" diff --git a/pkg/kubelet/dockershim/network/testing/plugins_test.go b/pkg/kubelet/dockershim/network/testing/plugins_test.go index dc2e92a6fb0..1a65d825fc5 100644 --- a/pkg/kubelet/dockershim/network/testing/plugins_test.go +++ b/pkg/kubelet/dockershim/network/testing/plugins_test.go @@ -25,10 +25,10 @@ import ( "testing" utilsets "k8s.io/apimachinery/pkg/util/sets" + sysctltest "k8s.io/component-helpers/node/utils/sysctl/testing" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" - sysctltest "k8s.io/kubernetes/pkg/util/sysctl/testing" netutils "k8s.io/utils/net" "github.com/golang/mock/gomock" diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index 4c2cee5cb5d..40e36035b28 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/pkg/kubemark/hollow_proxy.go @@ -25,6 +25,7 @@ import ( clientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/events" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/pkg/proxy" proxyconfig "k8s.io/kubernetes/pkg/proxy/config" @@ -32,7 +33,6 @@ import ( proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilnode "k8s.io/kubernetes/pkg/util/node" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" netutils "k8s.io/utils/net" utilpointer "k8s.io/utils/pointer" diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 99b2e01f23b..efc4acdb5cf 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -40,6 +40,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/events" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/proxy" @@ -51,7 +52,6 @@ import ( "k8s.io/kubernetes/pkg/util/async" "k8s.io/kubernetes/pkg/util/conntrack" utiliptables "k8s.io/kubernetes/pkg/util/iptables" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" netutils "k8s.io/utils/net" ) diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 4fcb362ae48..55b0096a1fc 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -44,6 +44,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/events" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/healthcheck" @@ -56,7 +57,6 @@ import ( utilipset "k8s.io/kubernetes/pkg/util/ipset" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilipvs "k8s.io/kubernetes/pkg/util/ipvs" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" ) const ( diff --git a/pkg/proxy/util/utils.go b/pkg/proxy/util/utils.go index e9c4eca3062..e6b5acdbb47 100644 --- a/pkg/proxy/util/utils.go +++ b/pkg/proxy/util/utils.go @@ -30,8 +30,8 @@ import ( utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/events" + utilsysctl "k8s.io/component-helpers/node/utils/sysctl" helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" netutils "k8s.io/utils/net" "k8s.io/klog/v2" diff --git a/pkg/util/sysctl/sysctl.go b/staging/src/k8s.io/component-helpers/node/utils/sysctl/sysctl.go similarity index 100% rename from pkg/util/sysctl/sysctl.go rename to staging/src/k8s.io/component-helpers/node/utils/sysctl/sysctl.go diff --git a/pkg/util/sysctl/testing/fake.go b/staging/src/k8s.io/component-helpers/node/utils/sysctl/testing/fake.go similarity index 96% rename from pkg/util/sysctl/testing/fake.go rename to staging/src/k8s.io/component-helpers/node/utils/sysctl/testing/fake.go index 1ae8607d247..2ee5a0f0cd0 100644 --- a/pkg/util/sysctl/testing/fake.go +++ b/staging/src/k8s.io/component-helpers/node/utils/sysctl/testing/fake.go @@ -19,7 +19,7 @@ package testing import ( "os" - "k8s.io/kubernetes/pkg/util/sysctl" + "k8s.io/component-helpers/node/utils/sysctl" ) // Fake is a map-backed implementation of sysctl.Interface, for testing/mocking. diff --git a/vendor/modules.txt b/vendor/modules.txt index baa3816c138..1156667d18e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1971,6 +1971,8 @@ k8s.io/component-helpers/apps/poddisruptionbudget k8s.io/component-helpers/auth/rbac/reconciliation k8s.io/component-helpers/auth/rbac/validation k8s.io/component-helpers/node/topology +k8s.io/component-helpers/node/utils/sysctl +k8s.io/component-helpers/node/utils/sysctl/testing k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/volume