Skip to content

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

Merge pull request #50973 from FengyunPan/fix-legacy-floatingip

Automatic merge from submit-queue (batch tested with PRs 50229, 50973, 50976, 51085, 51084) Fix legacy floatingip Fix #50974 If user specify floating-network-id by annotation rather than cloud provider file, openstack cloud provider don't delete floatingip when deleting LoadBalancer service. **Release note**: ```release-note NONE ```
parents 9cecb3b3 e5b7f0e7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file @ 33821862
...@@ -1116,7 +1116,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1116,7 +1116,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
return nil return nil
} }
if lbaas.opts.FloatingNetworkId != "" && loadbalancer != nil { if loadbalancer != nil && loadbalancer.VipPortID != "" {
portID := loadbalancer.VipPortID portID := loadbalancer.VipPortID
floatingIP, err := getFloatingIPByPortID(lbaas.network, portID) floatingIP, err := getFloatingIPByPortID(lbaas.network, portID)
if err != nil && err != ErrNotFound { if err != nil && err != ErrNotFound {
......
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