Unverified Commit baeb3af4 authored by xujunjie-cover's avatar xujunjie-cover Committed by GitHub
Browse files

fix: continue of deletion for del pod failed when can't found vpc or subnet (#1335)

* fix: continue of deletion for del pod failed when can't found vpc or subnet
Showing with 10 additions and 3 deletions
+10 -3
......@@ -591,11 +591,15 @@ func (c *Controller) handleDeletePod(pod *v1.Pod) error {
continue
}
subnet, err := c.subnetsLister.Get(address.Subnet.Name)
if err != nil {
if k8serrors.IsNotFound(err) {
continue
} else if err != nil {
return err
}
vpc, err := c.vpcsLister.Get(subnet.Spec.Vpc)
if err != nil {
if k8serrors.IsNotFound(err) {
continue
} else if err != nil {
return err
}
if err := c.ovnClient.DeleteStaticRoute(address.Ip, vpc.Status.Router); err != nil {
......
......@@ -13,6 +13,7 @@ import (
"github.com/alauda/felix/ipsets"
"github.com/vishvananda/netlink"
v1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2"
......@@ -204,7 +205,9 @@ func (c *Controller) removeEgressConfig(subnet, ip string) error {
}
podSubnet, err := c.subnetsLister.Get(subnet)
if err != nil {
if k8serrors.IsNotFound(err) {
return nil
} else if err != nil {
klog.Errorf("failed to get subnet %s: %+v", subnet, err)
return err
}
......
Supports Markdown
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