kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bazel updates for openstack floating ip resource deletion 

Variable Naming Sanity
This commit is contained in:
Derek Lemon -T (delemon - AEROTEK INC at Cisco) 2019-01-31 14:57:32 -07:00
parent 498615e10c
commit 752775d613
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/resources/openstack/BUILD.bazel
View File

@ -4,6 +4,7 @@ go_library(
name = "go_default_library",
srcs = [
"dns.go",
"floatingip.go",
"instances.go",
"lb.go",
"network.go",
@ -27,6 +28,7 @@ go_library(
"//vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/networks:go_default_library",

4
pkg/resources/openstack/floatingip.go
View File

@ -37,11 +37,11 @@ func DeleteL3FloatingIP(cloud fi.Cloud, r *resources.Resource) error {
func (os *clusterDiscoveryOS) listL3FloatingIPs(routerID string) ([]*resources.Resource, error) {
var resourceTrackers []*resources.Resource
l3floatingIPs, err := os.osCloud.ListL3FloatingIPs(l3floatingip.ListOpts{})
floatingIPs, err := os.osCloud.ListL3FloatingIPs(l3floatingip.ListOpts{})
if err != nil {
return resourceTrackers, err
}
for _, floatingIP := range l3floatingIPs {
for _, floatingIP := range floatingIPs {
if floatingIP.RouterID == routerID {
resourceTracker := &resources.Resource{
Name: floatingIP.FloatingIP,

14
upup/pkg/fi/cloudup/openstack/floatingip.go
View File

@ -147,11 +147,8 @@ func (c *openstackCloud) DeleteFloatingIP(id string) (err error) {
}
return true, nil
})
if !done {
if err == nil {
err = wait.ErrWaitTimeout
}
return err
if !done && err == nil {
err = wait.ErrWaitTimeout
}
return err
}
@ -165,11 +162,8 @@ func (c *openstackCloud) DeleteL3FloatingIP(id string) (err error) {
}
return true, nil
})
if !done {
if err == nil {
err = wait.ErrWaitTimeout
}
return err
if !done && err == nil {
err = wait.ErrWaitTimeout
}
return err
}