Tested with k8s v1.23.

Author: Jing Zhang

pkg/openstack/instances.go

@@ -19,7 +19,6 @@ package openstack
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"net"
 	sysos "os"
@@ -30,7 +29,6 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunk_details"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	neutronports "github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"github.com/gophercloud/gophercloud/pagination"
@@ -46,7 +44,6 @@ import (
 	"k8s.io/cloud-provider-openstack/pkg/util"
 	"k8s.io/cloud-provider-openstack/pkg/util/errors"
 	"k8s.io/cloud-provider-openstack/pkg/util/metadata"
-	"k8s.io/cloud-provider-openstack/pkg/util/openstack"
 )
 
 // Instances encapsulates an implementation of Instances for OpenStack.
@@ -576,7 +573,7 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*S
 // * access IPs
 // * metadata hostname
 // * server object Addresses (floating type)
-func nodeAddresses(srv *servers.Server, ports []neutronports.Port, client *gophercloud.ServiceClient, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) {
+func nodeAddresses(srv *servers.Server, ports []PortWithTrunkDetails, client *gophercloud.ServiceClient, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) {
 	addrs := []v1.NodeAddress{}
 
 	// parse private IP addresses first in an ordered manner
@@ -640,35 +637,24 @@ func nodeAddresses(srv *servers.Server, ports []neutronports.Port, client *gophe
 	// This exposes the vlan networks to which subports are attached
 	subportAddresses := make(map[string][]Address)
 
-	type portWithTrunkDetails struct {
-		neutronports.Port
-		trunk_details.TrunkDetailsExt
-	}
-	var portDetails []portWithTrunkDetails
-
-	bodyBytes, err := json.Marshal(ports)
-	if err == nil {
-		if json.Unmarshal(bodyBytes, &portDetails) == nil {
-			for _, portExt := range portDetails {
-				klog.V(5).Infof("Node '%s' port '%s' trunk_details '%v'", srv.Name, portExt.Name, portExt.TrunkDetails)
-				for _, subport := range portExt.TrunkDetails.SubPorts {
-					p, err := neutronports.Get(client, subport.PortID).Extract()
-					if err != nil {
-						klog.Errorf("Failed to get subport %s details: %v", subport.PortID, err)
-						continue
-					}
-					n, err := networks.Get(client, p.NetworkID).Extract()
-					if err != nil {
-						klog.Errorf("Failed to get subport %s network details: %v", subport.PortID, err)
-						continue
-					}
-					for _, fixedIP := range p.FixedIPs {
-						isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
-						if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
-							addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
-							subportAddresses[n.Name] = append(subportAddresses[n.Name], addr)
-						}
-					}
+	for _, port := range ports {
+		for _, subport := range port.TrunkDetails.SubPorts {
+			p, err := neutronports.Get(client, subport.PortID).Extract()
+			if err != nil {
+				klog.Errorf("Failed to get subport %s details: %v", subport.PortID, err)
+				continue
+			}
+			n, err := networks.Get(client, p.NetworkID).Extract()
+			if err != nil {
+				klog.Errorf("Failed to get subport %s network details: %v", subport.PortID, err)
+				continue
+			}
+			for _, fixedIP := range p.FixedIPs {
+				isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
+				if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
+					addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
+					subportAddresses[n.Name] = append(subportAddresses[n.Name], addr)
+					klog.V(5).Infof("Node '%s' is added subport '%s' address '%s/%s'", srv.Name, p.Name, n.Name, addr)
 				}
 			}
 		}
@@ -735,6 +721,7 @@ func nodeAddresses(srv *servers.Server, ports []neutronports.Port, client *gophe
 		sortNodeAddresses(addrs, networkingOpts.AddressSortOrder)
 	}
 
+	klog.V(5).Infof("Node '%s' returns addresses '%v'", srv.Name, addrs)
 	return addrs, nil
 }
 
@@ -753,10 +740,21 @@ func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName,
 }
 
 // getAttachedPorts returns a list of ports attached to a server.
-func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]neutronports.Port, error) {
+func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]PortWithTrunkDetails, error) {
 	listOpts := neutronports.ListOpts{
 		DeviceID: serverID,
 	}
 
-	return openstack.GetPorts(client, listOpts)
+	var ports []PortWithTrunkDetails
+
+	allPages, err := neutronports.List(client, listOpts).AllPages()
+	if err != nil {
+		return ports, err
+	}
+	err = neutronports.ExtractPortsInto(allPages, &ports)
+	if err != nil {
+		return ports, err
+	}
+
+	return ports, nil
 }

pkg/openstack/openstack.go

@@ -27,6 +27,8 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunk_details"
+	neutronports "github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"github.com/spf13/pflag"
 	gcfg "gopkg.in/gcfg.v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -67,6 +69,11 @@ func AddExtraFlags(fs *pflag.FlagSet) {
 	fs.StringArrayVar(&userAgentData, "user-agent", nil, "Extra data to add to gophercloud user-agent. Use multiple times to add more than one component.")
 }
 
+type PortWithTrunkDetails struct {
+	neutronports.Port
+	trunk_details.TrunkDetailsExt
+}
+
 // LoadBalancer is used for creating and maintaining load balancers
 type LoadBalancer struct {
 	secret  *gophercloud.ServiceClient