github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Move LocalTrafficDetector from pkg/proxy/util/iptables to pkg/proxy/util

Browse Source 
Since it's used for nftables as well now.
This commit is contained in:
Dan Winship
2023-11-04 19:46:47 -04:00
parent 8a9031f9c9
commit dc1155bd53
10 changed files with 78 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ import (
"k8s.io/kubernetes/pkg/proxy/metaproxier"
"k8s.io/kubernetes/pkg/proxy/metrics"
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables"
"k8s.io/kubernetes/pkg/util/async"
utilexec "k8s.io/utils/exec"
netutils "k8s.io/utils/net"
@@ -111,7 +110,7 @@ func NewDualStackProxier(
minSyncPeriod time.Duration,
masqueradeAll bool,
masqueradeBit int,
localDetectors [2]proxyutiliptables.LocalTrafficDetector,
localDetectors [2]proxyutil.LocalTrafficDetector,
hostname string,
nodeIPs map[v1.IPFamily]net.IP,
recorder events.EventRecorder,
@@ -170,7 +169,7 @@ type Proxier struct {
masqueradeAll bool
masqueradeMark string
conntrack conntrack.Interface
localDetector proxyutiliptables.LocalTrafficDetector
localDetector proxyutil.LocalTrafficDetector
hostname string
nodeIP net.IP
recorder events.EventRecorder
@@ -207,7 +206,7 @@ func NewProxier(ctx context.Context,
minSyncPeriod time.Duration,
masqueradeAll bool,
masqueradeBit int,
localDetector proxyutiliptables.LocalTrafficDetector,
localDetector proxyutil.LocalTrafficDetector,
hostname string,
nodeIP net.IP,
recorder events.EventRecorder,