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

fix test

This commit is contained in:
Jesse Haka 2021-01-12 15:50:40 +02:00
parent 185ccba246
commit 38831ff70d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ limitations under the License.
package openstack package openstack
import ( import (
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
l3floatingip "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" l3floatingip "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
"k8s.io/kops/pkg/resources" "k8s.io/kops/pkg/resources"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
@ -55,14 +56,14 @@ func (os *clusterDiscoveryOS) listL3FloatingIPs(routerID string) ([]*resources.R
return resourceTrackers, nil return resourceTrackers, nil
} }
func (os *clusterDiscoveryOS) listFloatingIPs(instanceID string) ([]*resources.Resource, error) { func (os *clusterDiscoveryOS) listFloatingIPs(instance servers.Server) ([]*resources.Resource, error) {
var resourceTrackers []*resources.Resource var resourceTrackers []*resources.Resource
instance, err := os.osCloud.GetInstance(instanceID) name := instance.Name
if err != nil { if val, ok := instance.Metadata[openstack.TagKopsName]; ok {
return resourceTrackers, err name = val
} }
floatingIPs, err := os.osCloud.ListL3FloatingIPs(l3floatingip.ListOpts{ floatingIPs, err := os.osCloud.ListL3FloatingIPs(l3floatingip.ListOpts{
Description: "fip-" + instance.Name, Description: "fip-" + name,
}) })
if err != nil { if err != nil {
return resourceTrackers, err return resourceTrackers, err

2
pkg/resources/openstack/instances.go
View File

@ -38,7 +38,7 @@ func (os *clusterDiscoveryOS) ListInstances() ([]*resources.Resource, error) {
val, ok := instance.Metadata["k8s"] val, ok := instance.Metadata["k8s"]
if ok && val == os.clusterName { if ok && val == os.clusterName {
// Clean up any bound floating IP's // Clean up any bound floating IP's
floatingIPs, err := os.listFloatingIPs(instance.ID) floatingIPs, err := os.listFloatingIPs(instance)
if err != nil { if err != nil {
return resourceTrackers, err return resourceTrackers, err
} }