mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
cleanup parseExcludedCIDRs
This commit is contained in:
parent
27c89b9aec
commit
b1c6e70255
@ -322,21 +322,6 @@ func (r *realIPGetter) BindedIPs() (sets.String, error) {
|
||||
// Proxier implements proxy.Provider
|
||||
var _ proxy.Provider = &Proxier{}
|
||||
|
||||
// parseExcludedCIDRs parses the input strings and returns net.IPNet
|
||||
// The validation has been done earlier so the error condition will never happen under normal conditions
|
||||
func parseExcludedCIDRs(excludeCIDRs []string) []*net.IPNet {
|
||||
var cidrExclusions []*net.IPNet
|
||||
for _, excludedCIDR := range excludeCIDRs {
|
||||
_, n, err := net.ParseCIDR(excludedCIDR)
|
||||
if err != nil {
|
||||
klog.Errorf("Error parsing exclude CIDR %q, err: %v", excludedCIDR, err)
|
||||
continue
|
||||
}
|
||||
cidrExclusions = append(cidrExclusions, n)
|
||||
}
|
||||
return cidrExclusions
|
||||
}
|
||||
|
||||
// NewProxier returns a new Proxier given an iptables and ipvs Interface instance.
|
||||
// Because of the iptables and ipvs logic, it is assumed that there is only a single Proxier active on a machine.
|
||||
// An error will be returned if it fails to update or acquire the initial lock.
|
||||
@ -457,6 +442,9 @@ func NewProxier(ipt utiliptables.Interface,
|
||||
klog.Warningf("IP Family: %s, NodePortAddresses of wrong family; %s", ipFamily, strings.Join(ips, ","))
|
||||
}
|
||||
|
||||
// excludeCIDRs has been validated before, here we just parse it to IPNet list
|
||||
parsedExcludeCIDRs, _ := utilnet.ParseCIDRs(excludeCIDRs)
|
||||
|
||||
proxier := &Proxier{
|
||||
ipFamily: ipFamily,
|
||||
portsMap: make(map[utilnet.LocalPort]utilnet.Closeable),
|
||||
@ -466,7 +454,7 @@ func NewProxier(ipt utiliptables.Interface,
|
||||
endpointsChanges: proxy.NewEndpointChangeTracker(hostname, nil, ipFamily, recorder, endpointSlicesEnabled, nil),
|
||||
syncPeriod: syncPeriod,
|
||||
minSyncPeriod: minSyncPeriod,
|
||||
excludeCIDRs: parseExcludedCIDRs(excludeCIDRs),
|
||||
excludeCIDRs: parsedExcludeCIDRs,
|
||||
iptables: ipt,
|
||||
masqueradeAll: masqueradeAll,
|
||||
masqueradeMark: masqueradeMark,
|
||||
|
@ -3815,7 +3815,8 @@ func TestCleanLegacyService(t *testing.T) {
|
||||
ipt := iptablestest.NewFake()
|
||||
ipvs := ipvstest.NewFake()
|
||||
ipset := ipsettest.NewFake(testIPSetVersion)
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, parseExcludedCIDRs([]string{"3.3.3.0/24", "4.4.4.0/24"}), false, v1.IPv4Protocol)
|
||||
excludeCIDRs, _ := utilnet.ParseCIDRs([]string{"3.3.3.0/24", "4.4.4.0/24"})
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, excludeCIDRs, false, v1.IPv4Protocol)
|
||||
|
||||
// All ipvs services that were processed in the latest sync loop.
|
||||
activeServices := map[string]bool{"ipvs0": true, "ipvs1": true}
|
||||
@ -4015,7 +4016,8 @@ func TestCleanLegacyRealServersExcludeCIDRs(t *testing.T) {
|
||||
ipvs := ipvstest.NewFake()
|
||||
ipset := ipsettest.NewFake(testIPSetVersion)
|
||||
gtm := NewGracefulTerminationManager(ipvs)
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, parseExcludedCIDRs([]string{"4.4.4.4/32"}), false, v1.IPv4Protocol)
|
||||
excludeCIDRs, _ := utilnet.ParseCIDRs([]string{"4.4.4.4/32"})
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, excludeCIDRs, false, v1.IPv4Protocol)
|
||||
fp.gracefuldeleteManager = gtm
|
||||
|
||||
vs := &utilipvs.VirtualServer{
|
||||
@ -4069,7 +4071,8 @@ func TestCleanLegacyService6(t *testing.T) {
|
||||
ipt := iptablestest.NewFake()
|
||||
ipvs := ipvstest.NewFake()
|
||||
ipset := ipsettest.NewFake(testIPSetVersion)
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, parseExcludedCIDRs([]string{"3000::/64", "4000::/64"}), false, v1.IPv4Protocol)
|
||||
excludeCIDRs, _ := utilnet.ParseCIDRs([]string{"3000::/64", "4000::/64"})
|
||||
fp := NewFakeProxier(ipt, ipvs, ipset, nil, excludeCIDRs, false, v1.IPv4Protocol)
|
||||
fp.nodeIP = net.ParseIP("::1")
|
||||
|
||||
// All ipvs services that were processed in the latest sync loop.
|
||||
|
Loading…
Reference in New Issue
Block a user