From bac632b9d10d1cf41f56a213b467eebfd351fde6 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 20 Aug 2020 20:59:25 +0200 Subject: [PATCH] Migrate floating IP getter to neutron --- upup/pkg/fi/cloudup/openstack/cloud.go | 2 +- upup/pkg/fi/cloudup/openstack/floatingip.go | 8 ++++---- upup/pkg/fi/cloudup/openstack/mock_cloud.go | 4 ++-- upup/pkg/fi/cloudup/openstacktasks/floatingip.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/upup/pkg/fi/cloudup/openstack/cloud.go b/upup/pkg/fi/cloudup/openstack/cloud.go index ae2b017d7b..5d8ac0e9ab 100644 --- a/upup/pkg/fi/cloudup/openstack/cloud.go +++ b/upup/pkg/fi/cloudup/openstack/cloud.go @@ -289,7 +289,7 @@ type OpenstackCloud interface { GetStorageAZFromCompute(azName string) (*az.AvailabilityZone, error) - GetFloatingIP(id string) (fip *floatingips.FloatingIP, err error) + GetL3FloatingIP(id string) (fip *l3floatingip.FloatingIP, err error) GetImage(name string) (i *images.Image, err error) diff --git a/upup/pkg/fi/cloudup/openstack/floatingip.go b/upup/pkg/fi/cloudup/openstack/floatingip.go index 8dc84d7ac0..8569fda0f0 100644 --- a/upup/pkg/fi/cloudup/openstack/floatingip.go +++ b/upup/pkg/fi/cloudup/openstack/floatingip.go @@ -25,14 +25,14 @@ import ( "k8s.io/kops/util/pkg/vfs" ) -func (c *openstackCloud) GetFloatingIP(id string) (fip *floatingips.FloatingIP, err error) { - return getFloatingIP(c, id) +func (c *openstackCloud) GetL3FloatingIP(id string) (fip *l3floatingip.FloatingIP, err error) { + return getL3FloatingIP(c, id) } -func getFloatingIP(c OpenstackCloud, id string) (fip *floatingips.FloatingIP, err error) { +func getL3FloatingIP(c OpenstackCloud, id string) (fip *l3floatingip.FloatingIP, err error) { done, err := vfs.RetryWithBackoff(readBackoff, func() (bool, error) { - fip, err = floatingips.Get(c.ComputeClient(), id).Extract() + fip, err = l3floatingip.Get(c.NetworkingClient(), id).Extract() if err != nil { return false, fmt.Errorf("GetFloatingIP: fetching floating IP (%s) failed: %v", id, err) } diff --git a/upup/pkg/fi/cloudup/openstack/mock_cloud.go b/upup/pkg/fi/cloudup/openstack/mock_cloud.go index b740007523..3ca5fdc46a 100644 --- a/upup/pkg/fi/cloudup/openstack/mock_cloud.go +++ b/upup/pkg/fi/cloudup/openstack/mock_cloud.go @@ -317,8 +317,8 @@ func (c *MockCloud) GetExternalSubnet() (subnet *subnets.Subnet, err error) { return getExternalSubnet(c, c.extSubnetName) } -func (c *MockCloud) GetFloatingIP(id string) (fip *floatingips.FloatingIP, err error) { - return getFloatingIP(c, id) +func (c *MockCloud) GetL3FloatingIP(id string) (fip *l3floatingip.FloatingIP, err error) { + return getL3FloatingIP(c, id) } func (c *MockCloud) GetImage(name string) (*images.Image, error) { diff --git a/upup/pkg/fi/cloudup/openstacktasks/floatingip.go b/upup/pkg/fi/cloudup/openstacktasks/floatingip.go index 73e5013ce6..6600128c13 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/floatingip.go +++ b/upup/pkg/fi/cloudup/openstacktasks/floatingip.go @@ -96,11 +96,11 @@ func (e *FloatingIP) FindIPAddress(context *fi.Context) (*string, error) { return nil, fmt.Errorf("Could not find port floatingips port=%s", fi.StringValue(e.LB.PortID)) } - fip, err := cloud.GetFloatingIP(fi.StringValue(e.ID)) + fip, err := cloud.GetL3FloatingIP(fi.StringValue(e.ID)) if err != nil { return nil, err } - return &fip.IP, nil + return &fip.FloatingIP, nil } // GetDependencies returns the dependencies of the Instance task