github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove an unnecessary abstraction

Browse Source 
safeIpset was a wrapper for thread-safely sharing an ipset.IPSet, but
this was unnecessary because ipset.IPSet is just a wrapper around exec
anyway and doesn't need any locking.
This commit is contained in:
Dan Winship 2023-12-18 19:58:47 -05:00
parent 2b5c0c281d
commit b69510b069
2 changed files with 2 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/proxy/ipvs/proxier.go
View File

@ -489,10 +489,8 @@ func NewDualStackProxier(
initOnly bool,
) (proxy.Provider, error) {
safeIpset := newSafeIpset(ipset)
// Create an ipv4 instance of the single-stack proxier
ipv4Proxier, err := NewProxier(v1.IPv4Protocol, ipt[0], ipvs, safeIpset, sysctl,
ipv4Proxier, err := NewProxier(v1.IPv4Protocol, ipt[0], ipvs, ipset, sysctl,
exec, syncPeriod, minSyncPeriod, filterCIDRs(false, excludeCIDRs), strictARP,
tcpTimeout, tcpFinTimeout, udpTimeout, masqueradeAll, masqueradeBit,
localDetectors[0], hostname, nodeIPs[v1.IPv4Protocol], recorder,
@ -501,7 +499,7 @@ func NewDualStackProxier(
return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err)
}
ipv6Proxier, err := NewProxier(v1.IPv6Protocol, ipt[1], ipvs, safeIpset, sysctl,
ipv6Proxier, err := NewProxier(v1.IPv6Protocol, ipt[1], ipvs, ipset, sysctl,
exec, syncPeriod, minSyncPeriod, filterCIDRs(true, excludeCIDRs), strictARP,
tcpTimeout, tcpFinTimeout, udpTimeout, masqueradeAll, masqueradeBit,
localDetectors[1], hostname, nodeIPs[v1.IPv6Protocol], recorder,

104
pkg/proxy/ipvs/safe_ipset.go
View File

@ -1,104 +0,0 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package ipvs
import (
"sync"
"k8s.io/kubernetes/pkg/proxy/ipvs/ipset"
)
type safeIpset struct {
ipset ipset.Interface
mu sync.Mutex
}
func newSafeIpset(ipset ipset.Interface) ipset.Interface {
return &safeIpset{
ipset: ipset,
}
}
// FlushSet deletes all entries from a named set.
func (s *safeIpset) FlushSet(set string) error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.FlushSet(set)
}
// DestroySet deletes a named set.
func (s *safeIpset) DestroySet(set string) error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.DestroySet(set)
}
// DestroyAllSets deletes all sets.
func (s *safeIpset) DestroyAllSets() error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.DestroyAllSets()
}
// CreateSet creates a new set. It will ignore error when the set already exists if ignoreExistErr=true.
func (s *safeIpset) CreateSet(set *ipset.IPSet, ignoreExistErr bool) error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.CreateSet(set, ignoreExistErr)
}
// AddEntry adds a new entry to the named set. It will ignore error when the entry already exists if ignoreExistErr=true.
func (s *safeIpset) AddEntry(entry string, set *ipset.IPSet, ignoreExistErr bool) error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.AddEntry(entry, set, ignoreExistErr)
}
// DelEntry deletes one entry from the named set
func (s *safeIpset) DelEntry(entry string, set string) error {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.DelEntry(entry, set)
}
// Test test if an entry exists in the named set
func (s *safeIpset) TestEntry(entry string, set string) (bool, error) {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.TestEntry(entry, set)
}
// ListEntries lists all the entries from a named set
func (s *safeIpset) ListEntries(set string) ([]string, error) {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.ListEntries(set)
}
// ListSets list all set names from kernel
func (s *safeIpset) ListSets() ([]string, error) {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.ListSets()
}
// GetVersion returns the "X.Y" version string for ipset.
func (s *safeIpset) GetVersion() (string, error) {
s.mu.Lock()
defer s.mu.Unlock()
return s.ipset.GetVersion()
}