Skip to content

K
k3s
Commit 72cb080c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46181 from FengyunPan/ignore-LBnotfound

Automatic merge from submit-queue Ignore ErrNotFound when delete LB resources IsNotFound error is fine since that means the object is deleted already, so let's check it before return error.
parents 0b1ab508 f5f75f38
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @ 72cb080c
...@@ -1102,7 +1102,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1102,7 +1102,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
var monitorIDs []string var monitorIDs []string
for _, listener := range listenerList { for _, listener := range listenerList {
pool, err := getPoolByListenerID(lbaas.network, loadbalancer.ID, listener.ID) pool, err := getPoolByListenerID(lbaas.network, loadbalancer.ID, listener.ID)
if err != nil { if err != nil && err != ErrNotFound {
return fmt.Errorf("Error getting pool for listener %s: %v", listener.ID, err) return fmt.Errorf("Error getting pool for listener %s: %v", listener.ID, err)
} }
poolIDs = append(poolIDs, pool.ID) poolIDs = append(poolIDs, pool.ID)
......
Markdown is supported
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