diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index 5380a8faaaf..96b52495155 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -47,12 +47,12 @@ import ( proxyconfigapi "k8s.io/kubernetes/pkg/proxy/apis/config" "k8s.io/kubernetes/pkg/proxy/iptables" "k8s.io/kubernetes/pkg/proxy/ipvs" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" proxymetrics "k8s.io/kubernetes/pkg/proxy/metrics" proxyutil "k8s.io/kubernetes/pkg/proxy/util" proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" utilipset "k8s.io/kubernetes/pkg/util/ipset" utiliptables "k8s.io/kubernetes/pkg/util/iptables" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" "k8s.io/utils/exec" netutils "k8s.io/utils/net" diff --git a/pkg/proxy/ipvs/graceful_termination.go b/pkg/proxy/ipvs/graceful_termination.go index 5cc92db57c0..5c873af5230 100644 --- a/pkg/proxy/ipvs/graceful_termination.go +++ b/pkg/proxy/ipvs/graceful_termination.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" ) const ( diff --git a/pkg/proxy/ipvs/graceful_termination_test.go b/pkg/proxy/ipvs/graceful_termination_test.go index 8aa8735f8f1..f3b5ba971c1 100644 --- a/pkg/proxy/ipvs/graceful_termination_test.go +++ b/pkg/proxy/ipvs/graceful_termination_test.go @@ -26,8 +26,8 @@ import ( netutils "k8s.io/utils/net" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" - utilipvstest "k8s.io/kubernetes/pkg/util/ipvs/testing" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" + utilipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing" ) func Test_GracefulDeleteRS(t *testing.T) { diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 2c8e0a34af2..d319a12e9c0 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -45,6 +45,7 @@ import ( "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/conntrack" "k8s.io/kubernetes/pkg/proxy/healthcheck" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" "k8s.io/kubernetes/pkg/proxy/metaproxier" "k8s.io/kubernetes/pkg/proxy/metrics" utilproxy "k8s.io/kubernetes/pkg/proxy/util" @@ -52,7 +53,6 @@ import ( "k8s.io/kubernetes/pkg/util/async" utilipset "k8s.io/kubernetes/pkg/util/ipset" utiliptables "k8s.io/kubernetes/pkg/util/iptables" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" ) const ( diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index 6ef2756dd27..8b1628e2768 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -40,6 +40,8 @@ import ( "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/healthcheck" netlinktest "k8s.io/kubernetes/pkg/proxy/ipvs/testing" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" + ipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing" "k8s.io/kubernetes/pkg/proxy/metrics" utilproxy "k8s.io/kubernetes/pkg/proxy/util" proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" @@ -49,8 +51,6 @@ import ( ipsettest "k8s.io/kubernetes/pkg/util/ipset/testing" utiliptables "k8s.io/kubernetes/pkg/util/iptables" iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" - ipvstest "k8s.io/kubernetes/pkg/util/ipvs/testing" "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" netutils "k8s.io/utils/net" diff --git a/pkg/util/ipvs/ipvs.go b/pkg/proxy/ipvs/util/ipvs.go similarity index 100% rename from pkg/util/ipvs/ipvs.go rename to pkg/proxy/ipvs/util/ipvs.go diff --git a/pkg/util/ipvs/ipvs_linux.go b/pkg/proxy/ipvs/util/ipvs_linux.go similarity index 99% rename from pkg/util/ipvs/ipvs_linux.go rename to pkg/proxy/ipvs/util/ipvs_linux.go index d6b94741521..a783d1d428b 100644 --- a/pkg/util/ipvs/ipvs_linux.go +++ b/pkg/proxy/ipvs/util/ipvs_linux.go @@ -46,7 +46,7 @@ type Protocol uint16 func New() Interface { handle, err := libipvs.New("") if err != nil { - klog.Errorf("IPVS interface can't be initialized, error: %v", err) + klog.ErrorS(err, "IPVS interface can't be initialized") return nil } return &runner{ diff --git a/pkg/util/ipvs/ipvs_linux_test.go b/pkg/proxy/ipvs/util/ipvs_linux_test.go similarity index 100% rename from pkg/util/ipvs/ipvs_linux_test.go rename to pkg/proxy/ipvs/util/ipvs_linux_test.go diff --git a/pkg/util/ipvs/ipvs_test.go b/pkg/proxy/ipvs/util/ipvs_test.go similarity index 100% rename from pkg/util/ipvs/ipvs_test.go rename to pkg/proxy/ipvs/util/ipvs_test.go diff --git a/pkg/util/ipvs/ipvs_unsupported.go b/pkg/proxy/ipvs/util/ipvs_unsupported.go similarity index 100% rename from pkg/util/ipvs/ipvs_unsupported.go rename to pkg/proxy/ipvs/util/ipvs_unsupported.go diff --git a/pkg/util/ipvs/testing/fake.go b/pkg/proxy/ipvs/util/testing/fake.go similarity index 99% rename from pkg/util/ipvs/testing/fake.go rename to pkg/proxy/ipvs/util/testing/fake.go index 5e4ad8e3264..5594659c9ad 100644 --- a/pkg/util/ipvs/testing/fake.go +++ b/pkg/proxy/ipvs/util/testing/fake.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" ) // FakeIPVS no-op implementation of ipvs Interface diff --git a/pkg/util/ipvs/testing/fake_test.go b/pkg/proxy/ipvs/util/testing/fake_test.go similarity index 99% rename from pkg/util/ipvs/testing/fake_test.go rename to pkg/proxy/ipvs/util/testing/fake_test.go index e8489087643..ec48e17784b 100644 --- a/pkg/util/ipvs/testing/fake_test.go +++ b/pkg/proxy/ipvs/util/testing/fake_test.go @@ -19,7 +19,7 @@ package testing import ( "testing" - utilipvs "k8s.io/kubernetes/pkg/util/ipvs" + utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" netutils "k8s.io/utils/net" ) diff --git a/pkg/util/ipvs/OWNERS b/pkg/util/ipvs/OWNERS deleted file mode 100644 index 3933cb9fd2f..00000000000 --- a/pkg/util/ipvs/OWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: - - sig-network-reviewers - - aroradaman - - uablrek -approvers: - - sig-network-approvers - - uablrek -labels: - - sig/network - - area/ipvs -emeritus_approvers: - - lbernail - - m1093782566