Skip to content

K
k3s
Commit 4c57053d authored by Sebastien LAWNICZAK's avatar Sebastien LAWNICZAK
Browse files
Options

Code review correction

Inverting code path on CreateTcploadBalancer to avoid branch divergence Removing useless variable vipAddr as vip have information needed Renaming 'error' variable on EnsureTCPLoadBalancerDeleted to be consistent
parent be5f9094
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 13 deletions
pkg/cloudprovider/providers/openstack/openstack.go
View file @ 4c57053d
...@@ -677,26 +677,20 @@ func (lb *LoadBalancer) CreateTCPLoadBalancer(name, region string, externalIP ne ...@@ -677,26 +677,20 @@ func (lb *LoadBalancer) CreateTCPLoadBalancer(name, region string, externalIP ne
status := &api.LoadBalancerStatus{} status := &api.LoadBalancerStatus{}
if lb.opts.FloatingNetworkId == "" {
status.Ingress = []api.LoadBalancerIngress{{IP: vip.Address}} status.Ingress = []api.LoadBalancerIngress{{IP: vip.Address}}
return status, nil if lb.opts.FloatingNetworkId != "" {
}
vipAddr, err := getVipByName(lb.network, name)
if err != nil {
return nil, err
}
floatIPOpts := floatingips.CreateOpts{ floatIPOpts := floatingips.CreateOpts{
FloatingNetworkID: lb.opts.FloatingNetworkId, FloatingNetworkID: lb.opts.FloatingNetworkId,
PortID: vipAddr.PortID, PortID: vip.PortID,
} }
floatIP, err := floatingips.Create(lb.network, floatIPOpts).Extract() floatIP, err := floatingips.Create(lb.network, floatIPOpts).Extract()
if err != nil { if err != nil {
return nil, err return nil, err
} }
status.Ingress = []api.LoadBalancerIngress{{IP: vip.Address}, {IP: floatIP.FloatingIP}} status.Ingress = append(status.Ingress, api.LoadBalancerIngress{IP: floatIP.FloatingIP})
}
return status, nil return status, nil
...@@ -777,9 +771,9 @@ func (lb *LoadBalancer) EnsureTCPLoadBalancerDeleted(name, region string) error ...@@ -777,9 +771,9 @@ func (lb *LoadBalancer) EnsureTCPLoadBalancerDeleted(name, region string) error
return err return err
} }
if floatingIP != nil { if floatingIP != nil {
error := floatingips.Delete(lb.network, floatingIP.ID).ExtractErr() err = floatingips.Delete(lb.network, floatingIP.ID).ExtractErr()
if error != nil && !isNotFound(error) { if err != nil && !isNotFound(err) {
return error return err
} }
} }
} }
......
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