Unverified Commit 30bf07a8 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

Merge pull request #68344 from Nordix/nordix-dev

Include all used hash types in compare when creating ipsets
parents 63f5db60 edd4fc25
...@@ -286,7 +286,7 @@ func (runner *runner) CreateSet(set *IPSet, ignoreExistErr bool) error { ...@@ -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),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment