From dc1155bd53320ebbe4badece021a900aab282b28 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sat, 4 Nov 2023 19:46:47 -0400 Subject: [PATCH] Move LocalTrafficDetector from pkg/proxy/util/iptables to pkg/proxy/util Since it's used for nftables as well now. --- cmd/kube-proxy/app/server_linux.go | 21 ++-- cmd/kube-proxy/app/server_linux_test.go | 104 +++++++++--------- pkg/proxy/iptables/proxier.go | 7 +- pkg/proxy/iptables/proxier_test.go | 5 +- pkg/proxy/ipvs/proxier.go | 7 +- pkg/proxy/ipvs/proxier_test.go | 3 +- pkg/proxy/nftables/proxier.go | 7 +- pkg/proxy/nftables/proxier_test.go | 5 +- .../{iptables/traffic.go => localdetector.go} | 2 +- .../traffic_test.go => localdetector_test.go} | 2 +- 10 files changed, 78 insertions(+), 85 deletions(-) rename pkg/proxy/util/{iptables/traffic.go => localdetector.go} (99%) rename pkg/proxy/util/{iptables/traffic_test.go => localdetector_test.go} (99%) diff --git a/cmd/kube-proxy/app/server_linux.go b/cmd/kube-proxy/app/server_linux.go index adeb91c75a6..7e93bbb29a9 100644 --- a/cmd/kube-proxy/app/server_linux.go +++ b/cmd/kube-proxy/app/server_linux.go @@ -53,7 +53,6 @@ import ( proxymetrics "k8s.io/kubernetes/pkg/proxy/metrics" "k8s.io/kubernetes/pkg/proxy/nftables" proxyutil "k8s.io/kubernetes/pkg/proxy/util" - proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" utiliptables "k8s.io/kubernetes/pkg/util/iptables" "k8s.io/utils/exec" ) @@ -165,8 +164,8 @@ func (s *ProxyServer) platformCheckSupported(ctx context.Context) (ipv4Supported func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.KubeProxyConfiguration, dualStack, initOnly bool) (proxy.Provider, error) { logger := klog.FromContext(ctx) var proxier proxy.Provider - var localDetectors [2]proxyutiliptables.LocalTrafficDetector - var localDetector proxyutiliptables.LocalTrafficDetector + var localDetectors [2]proxyutil.LocalTrafficDetector + var localDetector proxyutil.LocalTrafficDetector var err error if config.Mode == proxyconfigapi.ProxyModeIPTables { @@ -505,7 +504,7 @@ func detectNumCPU() int { return numCPU } -func getLocalDetector(logger klog.Logger, ipFamily v1.IPFamily, mode proxyconfigapi.LocalMode, config *proxyconfigapi.KubeProxyConfiguration, nodePodCIDRs []string) (proxyutiliptables.LocalTrafficDetector, error) { +func getLocalDetector(logger klog.Logger, ipFamily v1.IPFamily, mode proxyconfigapi.LocalMode, config *proxyconfigapi.KubeProxyConfiguration, nodePodCIDRs []string) (proxyutil.LocalTrafficDetector, error) { switch mode { case proxyconfigapi.LocalModeClusterCIDR: // LocalModeClusterCIDR is the default if --detect-local-mode wasn't passed, @@ -518,7 +517,7 @@ func getLocalDetector(logger klog.Logger, ipFamily v1.IPFamily, mode proxyconfig cidrsByFamily := proxyutil.MapCIDRsByIPFamily(strings.Split(clusterCIDRs, ",")) if len(cidrsByFamily[ipFamily]) != 0 { - return proxyutiliptables.NewDetectLocalByCIDR(cidrsByFamily[ipFamily][0].String()) + return proxyutil.NewDetectLocalByCIDR(cidrsByFamily[ipFamily][0].String()) } logger.Info("Detect-local-mode set to ClusterCIDR, but no cluster CIDR for family", "ipFamily", ipFamily) @@ -526,24 +525,24 @@ func getLocalDetector(logger klog.Logger, ipFamily v1.IPFamily, mode proxyconfig case proxyconfigapi.LocalModeNodeCIDR: cidrsByFamily := proxyutil.MapCIDRsByIPFamily(nodePodCIDRs) if len(cidrsByFamily[ipFamily]) != 0 { - return proxyutiliptables.NewDetectLocalByCIDR(cidrsByFamily[ipFamily][0].String()) + return proxyutil.NewDetectLocalByCIDR(cidrsByFamily[ipFamily][0].String()) } logger.Info("Detect-local-mode set to NodeCIDR, but no PodCIDR defined at node for family", "ipFamily", ipFamily) case proxyconfigapi.LocalModeBridgeInterface: - return proxyutiliptables.NewDetectLocalByBridgeInterface(config.DetectLocal.BridgeInterface) + return proxyutil.NewDetectLocalByBridgeInterface(config.DetectLocal.BridgeInterface) case proxyconfigapi.LocalModeInterfaceNamePrefix: - return proxyutiliptables.NewDetectLocalByInterfaceNamePrefix(config.DetectLocal.InterfaceNamePrefix) + return proxyutil.NewDetectLocalByInterfaceNamePrefix(config.DetectLocal.InterfaceNamePrefix) } logger.Info("Defaulting to no-op detect-local") - return proxyutiliptables.NewNoOpLocalDetector(), nil + return proxyutil.NewNoOpLocalDetector(), nil } -func getDualStackLocalDetectorTuple(logger klog.Logger, mode proxyconfigapi.LocalMode, config *proxyconfigapi.KubeProxyConfiguration, nodePodCIDRs []string) ([2]proxyutiliptables.LocalTrafficDetector, error) { - var localDetectors [2]proxyutiliptables.LocalTrafficDetector +func getDualStackLocalDetectorTuple(logger klog.Logger, mode proxyconfigapi.LocalMode, config *proxyconfigapi.KubeProxyConfiguration, nodePodCIDRs []string) ([2]proxyutil.LocalTrafficDetector, error) { + var localDetectors [2]proxyutil.LocalTrafficDetector var err error localDetectors[0], err = getLocalDetector(logger, v1.IPv4Protocol, mode, config, nodePodCIDRs) diff --git a/cmd/kube-proxy/app/server_linux_test.go b/cmd/kube-proxy/app/server_linux_test.go index 0b9c0162aa9..11ebc4bc849 100644 --- a/cmd/kube-proxy/app/server_linux_test.go +++ b/cmd/kube-proxy/app/server_linux_test.go @@ -39,7 +39,7 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" clientgotesting "k8s.io/client-go/testing" proxyconfigapi "k8s.io/kubernetes/pkg/proxy/apis/config" - proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" + proxyutil "k8s.io/kubernetes/pkg/proxy/util" "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" @@ -114,7 +114,7 @@ func Test_getLocalDetector(t *testing.T) { mode proxyconfigapi.LocalMode config *proxyconfigapi.KubeProxyConfiguration family v1.IPFamily - expected proxyutiliptables.LocalTrafficDetector + expected proxyutil.LocalTrafficDetector nodePodCIDRs []string errExpected bool }{ @@ -124,7 +124,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/14")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("10.0.0.0/14")), errExpected: false, }, { @@ -132,7 +132,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, family: v1.IPv6Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("2002:0:0:1234::/64")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("2002:0:0:1234::/64")), errExpected: false, }, { @@ -140,7 +140,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, family: v1.IPv6Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), errExpected: false, }, { @@ -148,7 +148,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, family: v1.IPv4Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), errExpected: false, }, { @@ -156,7 +156,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64,10.0.0.0/14"}, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/14")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("10.0.0.0/14")), errExpected: false, }, { @@ -164,7 +164,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: ""}, family: v1.IPv4Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), errExpected: false, }, // LocalModeNodeCIDR @@ -173,7 +173,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/24")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("10.0.0.0/24")), nodePodCIDRs: []string{"10.0.0.0/24"}, errExpected: false, }, @@ -182,7 +182,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, family: v1.IPv6Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), nodePodCIDRs: []string{"2002::1234:abcd:ffff:0:0/96"}, errExpected: false, }, @@ -191,7 +191,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, family: v1.IPv6Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), nodePodCIDRs: []string{"10.0.0.0/24"}, errExpected: false, }, @@ -200,7 +200,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, family: v1.IPv4Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), nodePodCIDRs: []string{"2002::1234:abcd:ffff:0:0/96"}, errExpected: false, }, @@ -209,7 +209,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14,2002:0:0:1234::/64"}, family: v1.IPv6Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), nodePodCIDRs: []string{"10.0.0.0/24", "2002::1234:abcd:ffff:0:0/96"}, errExpected: false, }, @@ -218,7 +218,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: ""}, family: v1.IPv4Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), nodePodCIDRs: []string{}, errExpected: false, }, @@ -228,7 +228,7 @@ func Test_getLocalDetector(t *testing.T) { mode: proxyconfigapi.LocalMode("abcd"), config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, family: v1.IPv4Protocol, - expected: proxyutiliptables.NewNoOpLocalDetector(), + expected: proxyutil.NewNoOpLocalDetector(), errExpected: false, }, // LocalModeBridgeInterface @@ -239,7 +239,7 @@ func Test_getLocalDetector(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{BridgeInterface: "eth"}, }, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByBridgeInterface("eth")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByBridgeInterface("eth")), errExpected: false, }, { @@ -249,7 +249,7 @@ func Test_getLocalDetector(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{BridgeInterface: "1234567890123456789"}, }, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByBridgeInterface("1234567890123456789")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByBridgeInterface("1234567890123456789")), errExpected: false, }, // LocalModeInterfaceNamePrefix @@ -260,7 +260,7 @@ func Test_getLocalDetector(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{InterfaceNamePrefix: "eth"}, }, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByInterfaceNamePrefix("eth")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByInterfaceNamePrefix("eth")), errExpected: false, }, { @@ -270,7 +270,7 @@ func Test_getLocalDetector(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{InterfaceNamePrefix: "1234567890123456789"}, }, family: v1.IPv4Protocol, - expected: resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByInterfaceNamePrefix("1234567890123456789")), + expected: resolveLocalDetector(t)(proxyutil.NewDetectLocalByInterfaceNamePrefix("1234567890123456789")), errExpected: false, }, } @@ -300,7 +300,7 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { name string mode proxyconfigapi.LocalMode config *proxyconfigapi.KubeProxyConfiguration - expected [2]proxyutiliptables.LocalTrafficDetector + expected [2]proxyutil.LocalTrafficDetector nodePodCIDRs []string errExpected bool }{ @@ -310,8 +310,8 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14,2002:0:0:1234::/64"}, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/14"))( - proxyutiliptables.NewDetectLocalByCIDR("2002:0:0:1234::/64")), + proxyutil.NewDetectLocalByCIDR("10.0.0.0/14"))( + proxyutil.NewDetectLocalByCIDR("2002:0:0:1234::/64")), errExpected: false, }, { @@ -319,33 +319,33 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64,10.0.0.0/14"}, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/14"))( - proxyutiliptables.NewDetectLocalByCIDR("2002:0:0:1234::/64")), + proxyutil.NewDetectLocalByCIDR("10.0.0.0/14"))( + proxyutil.NewDetectLocalByCIDR("2002:0:0:1234::/64")), errExpected: false, }, { name: "LocalModeClusterCIDR, single-stack IPv4 cluster", mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, - expected: [2]proxyutiliptables.LocalTrafficDetector{ - resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/14")), - proxyutiliptables.NewNoOpLocalDetector()}, + expected: [2]proxyutil.LocalTrafficDetector{ + resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("10.0.0.0/14")), + proxyutil.NewNoOpLocalDetector()}, errExpected: false, }, { name: "LocalModeClusterCIDR, single-stack IPv6 cluster", mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, - expected: [2]proxyutiliptables.LocalTrafficDetector{ - proxyutiliptables.NewNoOpLocalDetector(), - resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("2002:0:0:1234::/64"))}, + expected: [2]proxyutil.LocalTrafficDetector{ + proxyutil.NewNoOpLocalDetector(), + resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("2002:0:0:1234::/64"))}, errExpected: false, }, { name: "LocalModeClusterCIDR, no ClusterCIDR", mode: proxyconfigapi.LocalModeClusterCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: ""}, - expected: [2]proxyutiliptables.LocalTrafficDetector{proxyutiliptables.NewNoOpLocalDetector(), proxyutiliptables.NewNoOpLocalDetector()}, + expected: [2]proxyutil.LocalTrafficDetector{proxyutil.NewNoOpLocalDetector(), proxyutil.NewNoOpLocalDetector()}, errExpected: false, }, // LocalModeNodeCIDR @@ -354,8 +354,8 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14,2002:0:0:1234::/64"}, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/24"))( - proxyutiliptables.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), + proxyutil.NewDetectLocalByCIDR("10.0.0.0/24"))( + proxyutil.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), nodePodCIDRs: []string{"10.0.0.0/24", "2002::1234:abcd:ffff:0:0/96"}, errExpected: false, }, @@ -364,8 +364,8 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64,10.0.0.0/14"}, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/24"))( - proxyutiliptables.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), + proxyutil.NewDetectLocalByCIDR("10.0.0.0/24"))( + proxyutil.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96")), nodePodCIDRs: []string{"2002::1234:abcd:ffff:0:0/96", "10.0.0.0/24"}, errExpected: false, }, @@ -373,9 +373,9 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { name: "LocalModeNodeCIDR, single-stack IPv4 cluster", mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "10.0.0.0/14"}, - expected: [2]proxyutiliptables.LocalTrafficDetector{ - resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("10.0.0.0/24")), - proxyutiliptables.NewNoOpLocalDetector()}, + expected: [2]proxyutil.LocalTrafficDetector{ + resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("10.0.0.0/24")), + proxyutil.NewNoOpLocalDetector()}, nodePodCIDRs: []string{"10.0.0.0/24"}, errExpected: false, }, @@ -383,9 +383,9 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { name: "LocalModeNodeCIDR, single-stack IPv6 cluster", mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: "2002:0:0:1234::/64"}, - expected: [2]proxyutiliptables.LocalTrafficDetector{ - proxyutiliptables.NewNoOpLocalDetector(), - resolveLocalDetector(t)(proxyutiliptables.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96"))}, + expected: [2]proxyutil.LocalTrafficDetector{ + proxyutil.NewNoOpLocalDetector(), + resolveLocalDetector(t)(proxyutil.NewDetectLocalByCIDR("2002::1234:abcd:ffff:0:0/96"))}, nodePodCIDRs: []string{"2002::1234:abcd:ffff:0:0/96"}, errExpected: false, }, @@ -393,7 +393,7 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { name: "LocalModeNodeCIDR, no PodCIDRs", mode: proxyconfigapi.LocalModeNodeCIDR, config: &proxyconfigapi.KubeProxyConfiguration{ClusterCIDR: ""}, - expected: [2]proxyutiliptables.LocalTrafficDetector{proxyutiliptables.NewNoOpLocalDetector(), proxyutiliptables.NewNoOpLocalDetector()}, + expected: [2]proxyutil.LocalTrafficDetector{proxyutil.NewNoOpLocalDetector(), proxyutil.NewNoOpLocalDetector()}, nodePodCIDRs: []string{}, errExpected: false, }, @@ -405,8 +405,8 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{BridgeInterface: "eth"}, }, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByBridgeInterface("eth"))( - proxyutiliptables.NewDetectLocalByBridgeInterface("eth")), + proxyutil.NewDetectLocalByBridgeInterface("eth"))( + proxyutil.NewDetectLocalByBridgeInterface("eth")), errExpected: false, }, // LocalModeInterfaceNamePrefix @@ -417,8 +417,8 @@ func Test_getDualStackLocalDetectorTuple(t *testing.T) { DetectLocal: proxyconfigapi.DetectLocalConfiguration{InterfaceNamePrefix: "veth"}, }, expected: resolveDualStackLocalDetectors(t)( - proxyutiliptables.NewDetectLocalByInterfaceNamePrefix("veth"))( - proxyutiliptables.NewDetectLocalByInterfaceNamePrefix("veth")), + proxyutil.NewDetectLocalByInterfaceNamePrefix("veth"))( + proxyutil.NewDetectLocalByInterfaceNamePrefix("veth")), errExpected: false, }, } @@ -455,8 +455,8 @@ func makeNodeWithPodCIDRs(cidrs ...string) *v1.Node { } } -func resolveLocalDetector(t *testing.T) func(proxyutiliptables.LocalTrafficDetector, error) proxyutiliptables.LocalTrafficDetector { - return func(localDetector proxyutiliptables.LocalTrafficDetector, err error) proxyutiliptables.LocalTrafficDetector { +func resolveLocalDetector(t *testing.T) func(proxyutil.LocalTrafficDetector, error) proxyutil.LocalTrafficDetector { + return func(localDetector proxyutil.LocalTrafficDetector, err error) proxyutil.LocalTrafficDetector { t.Helper() if err != nil { t.Fatalf("Error resolving detect-local: %v", err) @@ -465,18 +465,18 @@ func resolveLocalDetector(t *testing.T) func(proxyutiliptables.LocalTrafficDetec } } -func resolveDualStackLocalDetectors(t *testing.T) func(localDetector proxyutiliptables.LocalTrafficDetector, err1 error) func(proxyutiliptables.LocalTrafficDetector, error) [2]proxyutiliptables.LocalTrafficDetector { - return func(localDetector proxyutiliptables.LocalTrafficDetector, err error) func(proxyutiliptables.LocalTrafficDetector, error) [2]proxyutiliptables.LocalTrafficDetector { +func resolveDualStackLocalDetectors(t *testing.T) func(localDetector proxyutil.LocalTrafficDetector, err1 error) func(proxyutil.LocalTrafficDetector, error) [2]proxyutil.LocalTrafficDetector { + return func(localDetector proxyutil.LocalTrafficDetector, err error) func(proxyutil.LocalTrafficDetector, error) [2]proxyutil.LocalTrafficDetector { t.Helper() if err != nil { t.Fatalf("Error resolving dual stack detect-local: %v", err) } - return func(otherLocalDetector proxyutiliptables.LocalTrafficDetector, err1 error) [2]proxyutiliptables.LocalTrafficDetector { + return func(otherLocalDetector proxyutil.LocalTrafficDetector, err1 error) [2]proxyutil.LocalTrafficDetector { t.Helper() if err1 != nil { t.Fatalf("Error resolving dual stack detect-local: %v", err) } - return [2]proxyutiliptables.LocalTrafficDetector{localDetector, otherLocalDetector} + return [2]proxyutil.LocalTrafficDetector{localDetector, otherLocalDetector} } } } diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 4d1c52e8e87..ac07749463a 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -51,7 +51,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" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilexec "k8s.io/utils/exec" @@ -107,7 +106,7 @@ func NewDualStackProxier( masqueradeAll bool, localhostNodePorts bool, masqueradeBit int, - localDetectors [2]proxyutiliptables.LocalTrafficDetector, + localDetectors [2]proxyutil.LocalTrafficDetector, hostname string, nodeIPs map[v1.IPFamily]net.IP, recorder events.EventRecorder, @@ -168,7 +167,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 @@ -229,7 +228,7 @@ func NewProxier(ctx context.Context, masqueradeAll bool, localhostNodePorts bool, masqueradeBit int, - localDetector proxyutiliptables.LocalTrafficDetector, + localDetector proxyutil.LocalTrafficDetector, hostname string, nodeIP net.IP, recorder events.EventRecorder, diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go index d3381c1ca35..5ae5788d8af 100644 --- a/pkg/proxy/iptables/proxier_test.go +++ b/pkg/proxy/iptables/proxier_test.go @@ -54,7 +54,6 @@ import ( "k8s.io/kubernetes/pkg/proxy/healthcheck" proxyutil "k8s.io/kubernetes/pkg/proxy/util" - proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" proxyutiltest "k8s.io/kubernetes/pkg/proxy/util/testing" "k8s.io/kubernetes/pkg/util/async" utiliptables "k8s.io/kubernetes/pkg/util/iptables" @@ -94,7 +93,7 @@ func NewFakeProxier(ipt utiliptables.Interface) *Proxier { ipfamily = v1.IPv6Protocol podCIDR = "fd00:10::/64" } - detectLocal, _ := proxyutiliptables.NewDetectLocalByCIDR(podCIDR) + detectLocal, _ := proxyutil.NewDetectLocalByCIDR(podCIDR) networkInterfacer := proxyutiltest.NewFakeNetwork() itf := net.Interface{Index: 0, MTU: 0, Name: "lo", HardwareAddr: nil, Flags: 0} @@ -5588,7 +5587,7 @@ func TestInternalExternalMasquerade(t *testing.T) { fp := NewFakeProxier(ipt) fp.masqueradeAll = tc.masqueradeAll if !tc.localDetector { - fp.localDetector = proxyutiliptables.NewNoOpLocalDetector() + fp.localDetector = proxyutil.NewNoOpLocalDetector() } setupTest(fp) diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index c11fbb6ab8d..193e1f832ca 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -53,7 +53,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" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilkernel "k8s.io/kubernetes/pkg/util/kernel" @@ -127,7 +126,7 @@ func NewDualStackProxier( udpTimeout 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, @@ -207,7 +206,7 @@ type Proxier struct { conntrack conntrack.Interface masqueradeAll bool masqueradeMark string - localDetector proxyutiliptables.LocalTrafficDetector + localDetector proxyutil.LocalTrafficDetector hostname string nodeIP net.IP recorder events.EventRecorder @@ -282,7 +281,7 @@ func NewProxier( udpTimeout time.Duration, masqueradeAll bool, masqueradeBit int, - localDetector proxyutiliptables.LocalTrafficDetector, + localDetector proxyutil.LocalTrafficDetector, hostname string, nodeIP net.IP, recorder events.EventRecorder, diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index 1ede4509fd6..fe9bb6a0e86 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -51,7 +51,6 @@ import ( ipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing" "k8s.io/kubernetes/pkg/proxy/metrics" proxyutil "k8s.io/kubernetes/pkg/proxy/util" - proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" proxyutiltest "k8s.io/kubernetes/pkg/proxy/util/testing" "k8s.io/kubernetes/pkg/util/async" utiliptables "k8s.io/kubernetes/pkg/util/iptables" @@ -148,7 +147,7 @@ func NewFakeProxier(ctx context.Context, ipt utiliptables.Interface, ipvs utilip ipset: ipset, conntrack: conntrack.NewFake(), strictARP: false, - localDetector: proxyutiliptables.NewNoOpLocalDetector(), + localDetector: proxyutil.NewNoOpLocalDetector(), hostname: testHostname, serviceHealthServer: healthcheck.NewFakeServiceHealthServer(), ipvsScheduler: defaultScheduler, diff --git a/pkg/proxy/nftables/proxier.go b/pkg/proxy/nftables/proxier.go index 31b7c77e1be..f3e1f68256f 100644 --- a/pkg/proxy/nftables/proxier.go +++ b/pkg/proxy/nftables/proxier.go @@ -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, diff --git a/pkg/proxy/nftables/proxier_test.go b/pkg/proxy/nftables/proxier_test.go index 91422373cc0..833aa5798c1 100644 --- a/pkg/proxy/nftables/proxier_test.go +++ b/pkg/proxy/nftables/proxier_test.go @@ -44,7 +44,6 @@ import ( "k8s.io/kubernetes/pkg/proxy/healthcheck" "k8s.io/kubernetes/pkg/proxy/metrics" proxyutil "k8s.io/kubernetes/pkg/proxy/util" - proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables" proxyutiltest "k8s.io/kubernetes/pkg/proxy/util/testing" "k8s.io/kubernetes/pkg/util/async" netutils "k8s.io/utils/net" @@ -85,7 +84,7 @@ func NewFakeProxier(ipFamily v1.IPFamily) (*knftables.Fake, *Proxier) { podCIDR = "fd00:10::/64" serviceCIDRs = "fd00:10:96::/112" } - detectLocal, _ := proxyutiliptables.NewDetectLocalByCIDR(podCIDR) + detectLocal, _ := proxyutil.NewDetectLocalByCIDR(podCIDR) nodePortAddresses := []string{fmt.Sprintf("%s/32", testNodeIP), fmt.Sprintf("%s/128", testNodeIPv6)} networkInterfacer := proxyutiltest.NewFakeNetwork() @@ -3905,7 +3904,7 @@ func TestInternalExternalMasquerade(t *testing.T) { nft, fp := NewFakeProxier(v1.IPv4Protocol) fp.masqueradeAll = tc.masqueradeAll if !tc.localDetector { - fp.localDetector = proxyutiliptables.NewNoOpLocalDetector() + fp.localDetector = proxyutil.NewNoOpLocalDetector() } setupTest(fp) diff --git a/pkg/proxy/util/iptables/traffic.go b/pkg/proxy/util/localdetector.go similarity index 99% rename from pkg/proxy/util/iptables/traffic.go rename to pkg/proxy/util/localdetector.go index 6c4f54b0c01..a4c5bc62987 100644 --- a/pkg/proxy/util/iptables/traffic.go +++ b/pkg/proxy/util/localdetector.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package iptables +package util import ( "fmt" diff --git a/pkg/proxy/util/iptables/traffic_test.go b/pkg/proxy/util/localdetector_test.go similarity index 99% rename from pkg/proxy/util/iptables/traffic_test.go rename to pkg/proxy/util/localdetector_test.go index 1741261a352..f21e2014f7e 100644 --- a/pkg/proxy/util/iptables/traffic_test.go +++ b/pkg/proxy/util/localdetector_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package iptables +package util import ( "reflect"