Skip to content

Commit

Permalink
fix: continue of deletion for del pod failed when can't found vpc or …
Browse files Browse the repository at this point in the history
…subnet (#1335)

* fix: continue of deletion for del pod failed when can't found vpc or subnet

(cherry picked from commit baeb3af)
  • Loading branch information
xujunjie-cover authored and oilbeater committed Feb 28, 2022
1 parent cf7f4bd commit a421d9f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
8 changes: 6 additions & 2 deletions pkg/controller/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,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 {
Expand Down
5 changes: 4 additions & 1 deletion pkg/daemon/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit a421d9f

Please sign in to comment.