From ebb0fdd4f6fd8cdf389e99eceb813a64c8720819 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 30 Jun 2023 12:19:44 -0400 Subject: [PATCH] Don't explicitly filter config.NodePortAddresses by IP family There's no need to do this any more: proxyutil.NodePortAddresses does it itself. --- cmd/kube-proxy/app/server_others.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index 76d44231757..c5961ee035a 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -111,8 +111,6 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio ipt[1] = iptInterface } - nodePortAddresses := config.NodePortAddresses - if !ipt[0].Present() { return nil, fmt.Errorf("iptables is not supported for primary IP family %q", primaryProtocol) } else if !ipt[1].Present() { @@ -125,7 +123,6 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio badAddrs := npaByFamily[secondaryFamily] if len(badAddrs) > 0 { klog.InfoS("Ignoring --nodeport-addresses of the wrong family", "ipFamily", secondaryFamily, "addresses", badAddrs) - nodePortAddresses = npaByFamily[s.PrimaryIPFamily] } } @@ -157,7 +154,7 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio s.NodeIPs, s.Recorder, s.HealthzServer, - nodePortAddresses, + config.NodePortAddresses, ) } else { // Create a single-stack proxier if and only if the node does not support dual-stack (i.e, no iptables support). @@ -183,7 +180,7 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio s.NodeIPs[s.PrimaryIPFamily], s.Recorder, s.HealthzServer, - nodePortAddresses, + config.NodePortAddresses, ) } @@ -230,7 +227,7 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio s.Recorder, s.HealthzServer, config.IPVS.Scheduler, - nodePortAddresses, + config.NodePortAddresses, kernelHandler, ) } else { @@ -262,7 +259,7 @@ func (s *ProxyServer) createProxier(config *proxyconfigapi.KubeProxyConfiguratio s.Recorder, s.HealthzServer, config.IPVS.Scheduler, - nodePortAddresses, + config.NodePortAddresses, kernelHandler, ) }