diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go index bcbdbe0f9da..29e4456457a 100644 --- a/pkg/proxy/iptables/proxier_test.go +++ b/pkg/proxy/iptables/proxier_test.go @@ -35,6 +35,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/lithammer/dedent" "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/proxy/ipvs/graceful_termination_test.go b/pkg/proxy/ipvs/graceful_termination_test.go index 9d04894731f..3b3d0d6c58e 100644 --- a/pkg/proxy/ipvs/graceful_termination_test.go +++ b/pkg/proxy/ipvs/graceful_termination_test.go @@ -24,10 +24,9 @@ import ( "reflect" "testing" - netutils "k8s.io/utils/net" - utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util" utilipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing" + netutils "k8s.io/utils/net" ) func Test_GracefulDeleteRS(t *testing.T) { diff --git a/pkg/proxy/ipvs/ipset.go b/pkg/proxy/ipvs/ipset.go index 056f80ca03d..193fc634b63 100644 --- a/pkg/proxy/ipvs/ipset.go +++ b/pkg/proxy/ipvs/ipset.go @@ -20,14 +20,13 @@ limitations under the License. package ipvs import ( - "k8s.io/apimachinery/pkg/util/sets" - utilversion "k8s.io/apimachinery/pkg/util/version" - utilipset "k8s.io/kubernetes/pkg/proxy/ipvs/ipset" - "fmt" "strings" + "k8s.io/apimachinery/pkg/util/sets" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/klog/v2" + utilipset "k8s.io/kubernetes/pkg/proxy/ipvs/ipset" ) const ( diff --git a/pkg/proxy/ipvs/netlink_linux.go b/pkg/proxy/ipvs/netlink_linux.go index 98c96bc7031..632b5078ad3 100644 --- a/pkg/proxy/ipvs/netlink_linux.go +++ b/pkg/proxy/ipvs/netlink_linux.go @@ -23,13 +23,13 @@ import ( "fmt" "net" + "github.com/vishvananda/netlink" + "golang.org/x/sys/unix" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" proxyutil "k8s.io/kubernetes/pkg/proxy/util" netutils "k8s.io/utils/net" - - "github.com/vishvananda/netlink" - "golang.org/x/sys/unix" ) type netlinkHandle struct { diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 11ec8c8d0d5..8f96e692b70 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -33,10 +33,6 @@ import ( "sync/atomic" "time" - "k8s.io/klog/v2" - utilexec "k8s.io/utils/exec" - netutils "k8s.io/utils/net" - v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" @@ -45,6 +41,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/events" utilsysctl "k8s.io/component-helpers/node/util/sysctl" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/conntrack" "k8s.io/kubernetes/pkg/proxy/healthcheck" @@ -56,6 +53,8 @@ import ( "k8s.io/kubernetes/pkg/util/async" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilkernel "k8s.io/kubernetes/pkg/util/kernel" + utilexec "k8s.io/utils/exec" + netutils "k8s.io/utils/net" ) const ( diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index b28ab05f4e3..86aacbd3634 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -31,6 +31,7 @@ import ( "time" "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/proxy/ipvs/testing/fake.go b/pkg/proxy/ipvs/testing/fake.go index cd5958ccd53..7b7544fa9c7 100644 --- a/pkg/proxy/ipvs/testing/fake.go +++ b/pkg/proxy/ipvs/testing/fake.go @@ -21,9 +21,9 @@ package testing import ( "fmt" - "k8s.io/utils/net" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/utils/net" ) // FakeNetlinkHandle mock implementation of proxy NetlinkHandle diff --git a/pkg/proxy/ipvs/util/ipvs_linux.go b/pkg/proxy/ipvs/util/ipvs_linux.go index e9513a64156..e038fad07b6 100644 --- a/pkg/proxy/ipvs/util/ipvs_linux.go +++ b/pkg/proxy/ipvs/util/ipvs_linux.go @@ -28,8 +28,8 @@ import ( "time" libipvs "github.com/moby/ipvs" - "golang.org/x/sys/unix" + "k8s.io/klog/v2" ) diff --git a/pkg/proxy/ipvs/util/ipvs_linux_test.go b/pkg/proxy/ipvs/util/ipvs_linux_test.go index e604cefbea6..f3595f260aa 100644 --- a/pkg/proxy/ipvs/util/ipvs_linux_test.go +++ b/pkg/proxy/ipvs/util/ipvs_linux_test.go @@ -24,11 +24,10 @@ import ( "reflect" "testing" - netutils "k8s.io/utils/net" - libipvs "github.com/moby/ipvs" - "golang.org/x/sys/unix" + + netutils "k8s.io/utils/net" ) func Test_toVirtualServer(t *testing.T) { diff --git a/pkg/proxy/nftables/proxier.go b/pkg/proxy/nftables/proxier.go index b12ecc9b956..36f4b2ee764 100644 --- a/pkg/proxy/nftables/proxier.go +++ b/pkg/proxy/nftables/proxier.go @@ -28,7 +28,6 @@ import ( "crypto/sha256" "encoding/base32" "fmt" - "golang.org/x/time/rate" "net" "os" "os/exec" @@ -39,7 +38,9 @@ import ( "sync/atomic" "time" - v1 "k8s.io/api/core/v1" + "golang.org/x/time/rate" + + "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" diff --git a/pkg/proxy/nftables/proxier_test.go b/pkg/proxy/nftables/proxier_test.go index c42e597a498..112d67997ba 100644 --- a/pkg/proxy/nftables/proxier_test.go +++ b/pkg/proxy/nftables/proxier_test.go @@ -21,7 +21,6 @@ package nftables import ( "fmt" - "golang.org/x/time/rate" "net" "reflect" "testing" @@ -29,6 +28,7 @@ import ( "github.com/lithammer/dedent" "github.com/stretchr/testify/assert" + "golang.org/x/time/rate" v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" diff --git a/pkg/proxy/winkernel/hcnutils.go b/pkg/proxy/winkernel/hcnutils.go index b6e2a400dcc..afb513b3fed 100644 --- a/pkg/proxy/winkernel/hcnutils.go +++ b/pkg/proxy/winkernel/hcnutils.go @@ -21,6 +21,7 @@ package winkernel import ( "github.com/Microsoft/hnslib/hcn" + "k8s.io/klog/v2" ) diff --git a/pkg/proxy/winkernel/hns.go b/pkg/proxy/winkernel/hns.go index fae5b1abc8a..13f1ea868fb 100644 --- a/pkg/proxy/winkernel/hns.go +++ b/pkg/proxy/winkernel/hns.go @@ -23,11 +23,11 @@ import ( "crypto/sha1" "encoding/json" "fmt" + "strings" "github.com/Microsoft/hnslib/hcn" - "k8s.io/klog/v2" - "strings" + "k8s.io/klog/v2" ) type HostNetworkService interface { diff --git a/pkg/proxy/winkernel/hns_test.go b/pkg/proxy/winkernel/hns_test.go index 6e676016fd5..74a51b68f31 100644 --- a/pkg/proxy/winkernel/hns_test.go +++ b/pkg/proxy/winkernel/hns_test.go @@ -21,14 +21,12 @@ package winkernel import ( "encoding/json" - - "github.com/Microsoft/hnslib/hcn" - "github.com/stretchr/testify/assert" - "strings" "testing" + "github.com/Microsoft/hnslib/hcn" "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" ) const ( diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index b60bfe1e701..3e038683109 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -31,6 +31,7 @@ import ( "github.com/Microsoft/hnslib" "github.com/Microsoft/hnslib/hcn" + v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/proxy/winkernel/proxier_test.go b/pkg/proxy/winkernel/proxier_test.go index c13f0694e18..e78a8003686 100644 --- a/pkg/proxy/winkernel/proxier_test.go +++ b/pkg/proxy/winkernel/proxier_test.go @@ -28,6 +28,7 @@ import ( "time" "github.com/Microsoft/hnslib/hcn" + v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"