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

Migrate floating IP getter to neutron

This commit is contained in:
Ole Markus With 2020-08-20 20:59:25 +02:00
parent cb005902b2
commit bac632b9d1
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/fi/cloudup/openstack/cloud.go
View File

@ -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)

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

@ -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)
}

4
upup/pkg/fi/cloudup/openstack/mock_cloud.go
View File

@ -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) {

4
upup/pkg/fi/cloudup/openstacktasks/floatingip.go
View File

@ -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