Remove the dependency of 'ipset' package on Kubernetes
We don't want everyone that uses the `net` package to get a transitive dependency on the Kubernetes APIs, so have it define the `UID` type. Conceptually this is a simple change because `UID` is a `string`, but unfortunately it is used in a lot of places.
This commit is contained in:
1 parent
a3c76e141b
commit
ca4f93d0d7
8 files changed
+103
-100
No files matched your search
+2
-3
@@ -11,7 +11,6 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/vishvananda/netlink"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
|
||||
"github.com/weaveworks/weave/common"
|
||||
"github.com/weaveworks/weave/common/chains"
|
||||
@@ -588,13 +587,13 @@ func ConfigureIPTables(config *BridgeConfig, ips ipset.Interface) error {
|
||||
|
||||
type NoMasqLocalTracker struct {
|
||||
ips ipset.Interface
|
||||
owner types.UID
|
||||
owner ipset.UID
|
||||
}
|
||||
|
||||
func NewNoMasqLocalTracker(ips ipset.Interface) *NoMasqLocalTracker {
|
||||
return &NoMasqLocalTracker{
|
||||
ips: ips,
|
||||
owner: types.UID(0), // dummy ipset owner
|
||||
owner: ipset.UID(0), // dummy ipset owner
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+16
-15
@@ -9,13 +9,14 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
)
|
||||
|
||||
type Name string
|
||||
|
||||
type Type string
|
||||
|
||||
type UID string
|
||||
|
||||
const (
|
||||
ListSet = Type("list:set")
|
||||
HashIP = Type("hash:ip")
|
||||
@@ -24,9 +25,9 @@ const (
|
||||
|
||||
type Interface interface {
|
||||
Create(ipsetName Name, ipsetType Type) error
|
||||
AddEntry(user types.UID, ipsetName Name, entry string, comment string) error
|
||||
DelEntry(user types.UID, ipsetName Name, entry string) error
|
||||
EntryExists(user types.UID, ipsetName Name, entry string) bool
|
||||
AddEntry(user UID, ipsetName Name, entry string, comment string) error
|
||||
DelEntry(user UID, ipsetName Name, entry string) error
|
||||
EntryExists(user UID, ipsetName Name, entry string) bool
|
||||
Exists(ipsetName Name) (bool, error)
|
||||
Flush(ipsetName Name) error
|
||||
Destroy(ipsetName Name) error
|
||||
@@ -50,7 +51,7 @@ type ipset struct {
|
||||
// There might be multiple users for the same ipset & entry pair because
|
||||
// events from k8s API server might be out of order causing duplicate IPs:
|
||||
// https://github.com/weaveworks/weave/issues/2792.
|
||||
users map[entryKey]map[types.UID]struct{}
|
||||
users map[entryKey]map[UID]struct{}
|
||||
}
|
||||
|
||||
func New(logger *log.Logger, maxListSize int) Interface {
|
||||
@@ -58,7 +59,7 @@ func New(logger *log.Logger, maxListSize int) Interface {
|
||||
Logger: logger,
|
||||
enableComments: true,
|
||||
maxListSize: maxListSize,
|
||||
users: make(map[entryKey]map[types.UID]struct{}),
|
||||
users: make(map[entryKey]map[UID]struct{}),
|
||||
}
|
||||
|
||||
// Check for comment support
|
||||
@@ -94,7 +95,7 @@ func (i *ipset) Create(ipsetName Name, ipsetType Type) error {
|
||||
return doExec(args...)
|
||||
}
|
||||
|
||||
func (i *ipset) AddEntry(user types.UID, ipsetName Name, entry string, comment string) error {
|
||||
func (i *ipset) AddEntry(user UID, ipsetName Name, entry string, comment string) error {
|
||||
i.Logger.Printf("adding entry %s to %s of %s", entry, ipsetName, user)
|
||||
|
||||
if !i.addUser(user, ipsetName, entry) { // already in the set
|
||||
@@ -110,7 +111,7 @@ func (i *ipset) AddEntry(user types.UID, ipsetName Name, entry string, comment s
|
||||
return doExec(args...)
|
||||
}
|
||||
|
||||
func (i *ipset) DelEntry(user types.UID, ipsetName Name, entry string) error {
|
||||
func (i *ipset) DelEntry(user UID, ipsetName Name, entry string) error {
|
||||
i.Logger.Printf("deleting entry %s from %s of %s", entry, ipsetName, user)
|
||||
|
||||
if !i.delUser(user, ipsetName, entry) { // still needed
|
||||
@@ -122,7 +123,7 @@ func (i *ipset) DelEntry(user types.UID, ipsetName Name, entry string) error {
|
||||
return doExec("del", string(ipsetName), entry)
|
||||
}
|
||||
|
||||
func (i *ipset) EntryExists(user types.UID, ipsetName Name, entry string) bool {
|
||||
func (i *ipset) EntryExists(user UID, ipsetName Name, entry string) bool {
|
||||
return i.existUser(user, ipsetName, entry)
|
||||
}
|
||||
|
||||
@@ -146,7 +147,7 @@ func (i *ipset) Flush(ipsetName Name) error {
|
||||
}
|
||||
|
||||
func (i *ipset) FlushAll() error {
|
||||
i.users = make(map[entryKey]map[types.UID]struct{})
|
||||
i.users = make(map[entryKey]map[UID]struct{})
|
||||
return doExec("flush")
|
||||
}
|
||||
|
||||
@@ -156,7 +157,7 @@ func (i *ipset) Destroy(ipsetName Name) error {
|
||||
}
|
||||
|
||||
func (i *ipset) DestroyAll() error {
|
||||
i.users = make(map[entryKey]map[types.UID]struct{})
|
||||
i.users = make(map[entryKey]map[UID]struct{})
|
||||
return doExec("destroy")
|
||||
}
|
||||
|
||||
@@ -179,12 +180,12 @@ func (i *ipset) List(prefix string) ([]Name, error) {
|
||||
}
|
||||
|
||||
// Returns true if entry does not exist in ipset (entry has to be inserted into ipset).
|
||||
func (i *ipset) addUser(user types.UID, ipsetName Name, entry string) bool {
|
||||
func (i *ipset) addUser(user UID, ipsetName Name, entry string) bool {
|
||||
k := entryKey{ipsetName, entry}
|
||||
add := false
|
||||
|
||||
if i.users[k] == nil {
|
||||
i.users[k] = make(map[types.UID]struct{})
|
||||
i.users[k] = make(map[UID]struct{})
|
||||
}
|
||||
if len(i.users[k]) == 0 {
|
||||
add = true
|
||||
@@ -195,7 +196,7 @@ func (i *ipset) addUser(user types.UID, ipsetName Name, entry string) bool {
|
||||
}
|
||||
|
||||
// Returns true if user is the last owner of entry (entry has to be removed from ipset).
|
||||
func (i *ipset) delUser(user types.UID, ipsetName Name, entry string) bool {
|
||||
func (i *ipset) delUser(user UID, ipsetName Name, entry string) bool {
|
||||
k := entryKey{ipsetName, entry}
|
||||
|
||||
oneLeft := len(i.users[k]) == 1
|
||||
@@ -208,7 +209,7 @@ func (i *ipset) delUser(user types.UID, ipsetName Name, entry string) bool {
|
||||
return oneLeft && (len(i.users[k]) == 0)
|
||||
}
|
||||
|
||||
func (i *ipset) existUser(user types.UID, ipsetName Name, entry string) bool {
|
||||
func (i *ipset) existUser(user UID, ipsetName Name, entry string) bool {
|
||||
_, ok := i.users[entryKey{ipsetName, entry}][user]
|
||||
return ok
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user