diff --git a/go.mod b/go.mod index 0bcd8b4fe2f..022ecd3a0ff 100644 --- a/go.mod +++ b/go.mod @@ -41,9 +41,10 @@ require ( k8s.io/api v0.24.4 k8s.io/apimachinery v0.24.4 k8s.io/client-go v12.0.0+incompatible - k8s.io/klog/v2 v2.80.0 + k8s.io/klog/v2 v2.80.1 k8s.io/kubernetes v1.24.4 k8s.io/sample-controller v0.24.4 + k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 kubevirt.io/client-go v0.56.0 sigs.k8s.io/controller-runtime v0.12.3 ) @@ -144,7 +145,6 @@ require ( k8s.io/component-helpers v0.24.4 // indirect k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect k8s.io/kube-proxy v0.24.4 // indirect - k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect kubevirt.io/api v0.56.0 // indirect kubevirt.io/containerized-data-importer-api v1.54.0 // indirect kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect diff --git a/go.sum b/go.sum index 573fce22250..d5b2e0e89d7 100644 --- a/go.sum +++ b/go.sum @@ -1956,8 +1956,8 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.80.0 h1:lyJt0TWMPaGoODa8B8bUuxgHS3W/m/bNr2cca3brA/g= -k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-aggregator v0.24.4/go.mod h1:5h/GX6F1Tk1YZf6N8l3TElwR+nB+lT8dKRUlxeMaMBs= k8s.io/kube-controller-manager v0.24.4/go.mod h1:TWE865ujpJ29d0z1NR3Vfa1UffVRlws07E02/+DsGmk= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= @@ -1988,8 +1988,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsMoD+Izn93E/hm8U= -k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kubevirt.io/api v0.56.0 h1:BLQ88qkfy1+zZK2+RuZUI8kBTC6QUchmNw8jTyhUCls= kubevirt.io/api v0.56.0/go.mod h1:Qp0JL1vT194eyJ4gy6EokSxnuQveo332dCGX3i5nh/A= kubevirt.io/client-go v0.56.0 h1:z9iLBeELojvgHQb57aFS7eX5DXt140f/pbX4JRoqyoo= diff --git a/pkg/daemon/gateway_linux.go b/pkg/daemon/gateway_linux.go index 96cdab68f89..aadfca47694 100644 --- a/pkg/daemon/gateway_linux.go +++ b/pkg/daemon/gateway_linux.go @@ -17,6 +17,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog/v2" + k8sipset "k8s.io/kubernetes/pkg/util/ipset" + k8sexec "k8s.io/utils/exec" kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" "github.com/kubeovn/kube-ovn/pkg/ovs" @@ -914,15 +916,10 @@ func (c *Controller) deleteLegacySnatRules(protocol, table, chain string) error } func ipsetExists(name string) (bool, error) { - result, err := netlink.IpsetListAll() + sets, err := k8sipset.New(k8sexec.New()).ListSets() if err != nil { - return false, fmt.Errorf("failed to list ipsets: %v", err) + return false, fmt.Errorf("failed to list ipset names: %v", err) } - for _, ipset := range result { - if ipset.SetName == name { - return true, nil - } - } - return false, nil + return util.ContainsString(sets, name), nil }