github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68344 from Nordix/nordix-dev 

Include all used hash types in compare when creating ipsets
pull/58/head
k8s-ci-robot 2018-09-25 14:40:51 -07:00 committed by GitHub
parent 63f5db60e5 edd4fc2533
commit 30bf07a8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/ipset/ipset.go
View File

@ -286,7 +286,7 @@ func (runner *runner) CreateSet(set *IPSet, ignoreExistErr bool) error {
// otherwise raised when the same set (setname and create parameters are identical) already exists. // otherwise raised when the same set (setname and create parameters are identical) already exists.
func (runner *runner) createSet(set *IPSet, ignoreExistErr bool) error { func (runner *runner) createSet(set *IPSet, ignoreExistErr bool) error {
args := []string{"create", set.Name, string(set.SetType)} args := []string{"create", set.Name, string(set.SetType)}
if set.SetType == HashIPPortIP || set.SetType == HashIPPort { if set.SetType == HashIPPortIP || set.SetType == HashIPPort || set.SetType == HashIPPortNet {
args = append(args, args = append(args,
"family", set.HashFamily, "family", set.HashFamily,
"hashsize", strconv.Itoa(set.HashSize), "hashsize", strconv.Itoa(set.HashSize),