github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix up kube-proxy import ordering/organization.

Browse Source
This commit is contained in:
Dan Winship 2025-01-11 09:17:37 -05:00
parent 45fa12f8af
commit 13f0449e4c
16 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/proxy/iptables/proxier_test.go
View File

@ -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"

3
pkg/proxy/ipvs/graceful_termination_test.go
View File

@ -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) {

7
pkg/proxy/ipvs/ipset.go
View File

@ -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 (

6
pkg/proxy/ipvs/netlink_linux.go
View File

@ -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 {

7
pkg/proxy/ipvs/proxier.go
View File

@ -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 (

1
pkg/proxy/ipvs/proxier_test.go
View File

@ -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"

2
pkg/proxy/ipvs/testing/fake.go
View File

@ -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

2
pkg/proxy/ipvs/util/ipvs_linux.go
View File

@ -28,8 +28,8 @@ import (
"time"
libipvs "github.com/moby/ipvs"
"golang.org/x/sys/unix"
"k8s.io/klog/v2"
)

5
pkg/proxy/ipvs/util/ipvs_linux_test.go
View File

@ -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) {

5
pkg/proxy/nftables/proxier.go
View File

@ -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"

2
pkg/proxy/nftables/proxier_test.go
View File

@ -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"

1
pkg/proxy/winkernel/hcnutils.go
View File

@ -21,6 +21,7 @@ package winkernel
import (
"github.com/Microsoft/hnslib/hcn"
"k8s.io/klog/v2"
)

4
pkg/proxy/winkernel/hns.go
View File

@ -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 {

6
pkg/proxy/winkernel/hns_test.go
View File

@ -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 (

1
pkg/proxy/winkernel/proxier.go
View File

@ -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"

1
pkg/proxy/winkernel/proxier_test.go
View File

@ -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"