Skip to content

Commit aa23e55

Browse files
authored
Merge pull request #1461 from zrggw/ipsec_controller_test
add ipsec controller unit test
2 parents d85106f + 7a9dffa commit aa23e55

File tree

2 files changed

+761
-2
lines changed

2 files changed

+761
-2
lines changed

pkg/controller/encryption/ipsec/ipsec_controller.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,19 @@ func (c *IPSecController) handleKNIDelete(obj interface{}) {
290290
deleteFunc := func(netns.NetNS) error {
291291
for _, targetIP := range node.Spec.Addresses {
292292
c.ipsecHandler.mutex.Lock()
293-
_ = c.ipsecHandler.Clean(targetIP)
293+
err := c.ipsecHandler.Clean(targetIP)
294294
c.ipsecHandler.mutex.Unlock()
295+
if err != nil {
296+
return err
297+
}
295298
}
296299
return nil
297300
}
298-
_ = netns.WithNetNSPath(nodeNsPath, deleteFunc)
301+
err := netns.WithNetNSPath(nodeNsPath, deleteFunc)
302+
if err != nil {
303+
log.Errorf("failed to delete ipsec for node %s: %v", node.Name, err)
304+
return
305+
}
299306
for _, podCIDR := range node.Spec.PodCIDRs {
300307
c.deleteKNIMapCIDR(podCIDR, c.kniMap)
301308
}
@@ -441,6 +448,7 @@ func (c *IPSecController) processNextItem() bool {
441448
log.Errorf("failed to handle other node %s err: %v, giving up", name, err)
442449
c.queue.Forget(key)
443450
}
451+
return true
444452
}
445453

446454
c.queue.Forget(key)

0 commit comments

Comments
 (0)