From d351b9f0203f4d13e6f1739914932cb7146641f0 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 17 Oct 2018 15:34:46 +0530 Subject: [PATCH] remove weave-local-pods ipset which no longer used by weave-npc --- prog/weave-npc/main.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/prog/weave-npc/main.go b/prog/weave-npc/main.go index ea164d4a..44c65a37 100644 --- a/prog/weave-npc/main.go +++ b/prog/weave-npc/main.go @@ -186,6 +186,17 @@ func createBaseRules(ipt *iptables.IPTables, ips ipset.Interface) error { return err } + // delete `weave-local-pods` ipset which is no longer used by weave-npc + weaveLocalPodExist, err := ipsetExist(ips, npc.LocalIpset) + if err != nil { + common.Log.Errorf("Failed to destroy ipset '%s'", npc.LocalIpset) + } else if weaveLocalPodExist { + common.Log.Debugf("Destroying ipset '%s'", npc.LocalIpset) + if err := ips.Destroy(npc.LocalIpset); err != nil { + common.Log.Errorf("Failed to destroy ipset '%s'", npc.LocalIpset) + } + } + return nil }