Merge pull request #6431 from zetaab/useifexist

fix error when updating/creating lb in openstack
kubernetes · Feb 19, 2019 · 487ac63 · 487ac63
2 parents be2a6a5 + 6ce8fba
commit 487ac63
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/upup/pkg/fi/cloudup/openstacktasks/floatingip.go b/upup/pkg/fi/cloudup/openstacktasks/floatingip.go
@@ -48,6 +48,20 @@ func (e *FloatingIP) FindIPAddress(context *fi.Context) (*string, error) {
 	}
 
 	cloud := context.Cloud.(openstack.OpenstackCloud)
+	// try to find using portid, the floatingips always attached to port
+	if e.ID == nil && e.LB != nil && e.LB.PortID != nil {
+		fips, err := cloud.ListL3FloatingIPs(l3floatingip.ListOpts{
+			PortID: fi.StringValue(e.LB.PortID),
+		})
+		if err != nil {
+			return nil, err
+		}
+		if len(fips) == 1 && fips[0].PortID == fi.StringValue(e.LB.PortID) {
+			return &fips[0].FloatingIP, nil
+		}
+		// not found
+		return nil, nil
+	}
 
 	fip, err := cloud.GetFloatingIP(fi.StringValue(e.ID))
 	if err != nil {