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

proxy/iptables: Remove a no-op check

Browse Source 
There was code to deal with endpoints that have invalid/empty IP
addresses, but EndpointSlice validation already ensures that these
can't exist.
This commit is contained in:
Dan Winship 2021-11-02 17:19:16 -04:00
parent 6ab3dc6875
commit 3679639cf1
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/proxy/iptables/proxier.go
View File

@ -1387,12 +1387,6 @@ func (proxier *Proxier) syncProxyRules() {
// Now write loadbalancing & DNAT rules. // Now write loadbalancing & DNAT rules.
numReadyEndpoints := len(readyEndpointChains) numReadyEndpoints := len(readyEndpointChains)
for i, endpointChain := range readyEndpointChains { for i, endpointChain := range readyEndpointChains {
epIP := readyEndpoints[i].IP()
if epIP == "" {
// Error parsing this endpoint has been logged. Skip to next endpoint.
continue
}
// Balancing rules in the per-service chain. // Balancing rules in the per-service chain.
args = append(args[:0], "-A", string(svcChain)) args = append(args[:0], "-A", string(svcChain))
args = proxier.appendServiceCommentLocked(args, svcNameString) args = proxier.appendServiceCommentLocked(args, svcNameString)
@ -1411,18 +1405,12 @@ func (proxier *Proxier) syncProxyRules() {
// Every endpoint gets a chain, regardless of its state. This is required later since we may // Every endpoint gets a chain, regardless of its state. This is required later since we may
// want to jump to endpoint chains that are terminating. // want to jump to endpoint chains that are terminating.
for i, endpointChain := range endpointChains { for i, endpointChain := range endpointChains {
epIP := endpoints[i].IP()
if epIP == "" {
// Error parsing this endpoint has been logged. Skip to next endpoint.
continue
}
// Rules in the per-endpoint chain. // Rules in the per-endpoint chain.
args = append(args[:0], "-A", string(endpointChain)) args = append(args[:0], "-A", string(endpointChain))
args = proxier.appendServiceCommentLocked(args, svcNameString) args = proxier.appendServiceCommentLocked(args, svcNameString)
// Handle traffic that loops back to the originator with SNAT. // Handle traffic that loops back to the originator with SNAT.
utilproxy.WriteLine(proxier.natRules, append(args, utilproxy.WriteLine(proxier.natRules, append(args,
"-s", utilproxy.ToCIDR(netutils.ParseIPSloppy(epIP)), "-s", utilproxy.ToCIDR(netutils.ParseIPSloppy(endpoints[i].IP())),
"-j", string(KubeMarkMasqChain))...) "-j", string(KubeMarkMasqChain))...)
// Update client-affinity lists. // Update client-affinity lists.
if svcInfo.SessionAffinityType() == v1.ServiceAffinityClientIP { if svcInfo.SessionAffinityType() == v1.ServiceAffinityClientIP {