code review

kubernetes · Jan 8, 2020 · d9f8413 · d9f8413
1 parent 27332be
commit d9f8413
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -675,21 +675,23 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*S
 // * interfaces private IPs
 // * access IPs
 // * metadata hostname
-// * server object Addresses
+// * server object Addresses (floating type)
 func nodeAddresses(srv *servers.Server, interfaces []attachinterfaces.Interface, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) {
 	addrs := []v1.NodeAddress{}
 
 	// parse private IP addresses first in an ordered manner
 	for _, iface := range interfaces {
 		for _, fixedIP := range iface.FixedIPs {
-			isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
-			if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
-				v1helper.AddToNodeAddresses(&addrs,
-					v1.NodeAddress{
-						Type:    v1.NodeInternalIP,
-						Address: fixedIP.IPAddress,
-					},
-				)
+			if iface.PortState == "ACTIVE" {
+				isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
+				if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
+					v1helper.AddToNodeAddresses(&addrs,
+						v1.NodeAddress{
+							Type:    v1.NodeInternalIP,
+							Address: fixedIP.IPAddress,
+						},
+					)
+				}
 			}
 		}
 	}

diff --git a/pkg/cloudprovider/providers/openstack/openstack_test.go b/pkg/cloudprovider/providers/openstack/openstack_test.go
@@ -593,9 +593,11 @@ func TestNodeAddresses(t *testing.T) {
 			FixedIPs: []attachinterfaces.FixedIP{
 				{
 					IPAddress: "10.0.0.32",
+					PortState: "ACTIVE",
 				},
 				{
 					IPAddress: "10.0.0.31",
+					PortState: "ACTIVE",
 				},
 			},
 		},
@@ -671,9 +673,11 @@ func TestNodeAddressesCustomPublicNetwork(t *testing.T) {
 			FixedIPs: []attachinterfaces.FixedIP{
 				{
 					IPAddress: "10.0.0.32",
+					PortState: "ACTIVE",
 				},
 				{
 					IPAddress: "10.0.0.31",
+					PortState: "ACTIVE",
 				},
 			},
 		},
@@ -749,9 +753,11 @@ func TestNodeAddressesIPv6Disabled(t *testing.T) {
 			FixedIPs: []attachinterfaces.FixedIP{
 				{
 					IPAddress: "10.0.0.32",
+					PortState: "ACTIVE",
 				},
 				{
 					IPAddress: "10.0.0.31",
+					PortState: "ACTIVE",
 				},
 			},
 		},