Take care of two code comments:

(1) Separate code changes in nodeAddresses() to a function
(2) Add feature activation flag trunk-spport-enabled in Networking config

Author: Jing Zhang

docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md

@@ -159,6 +159,8 @@ The options in `Global` section are used for openstack-cloud-controller-manager
 
 ###  Networking
 
+* `trunk-support-enabled`
+  Indicates whether or not IP addresses attached via trunk is supported. Default: false
 * `ipv6-support-disabled`
   Indicates whether or not IPv6 is supported. Default: false
 * `public-network-name`

pkg/openstack/instances.go

@@ -237,7 +237,7 @@ func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID st
 		return []v1.NodeAddress{}, err
 	}
 
-	ports, err := getAttachedPorts(i.network, server.ID)
+	ports, err := getAttachedPorts(i.network, i.networkingOpts, server.ID)
 	if err != nil {
 		return []v1.NodeAddress{}, err
 	}
@@ -343,7 +343,7 @@ func (i *Instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
 		return nil, err
 	}
 
-	ports, err := getAttachedPorts(i.network, srv.ID)
+	ports, err := getAttachedPorts(i.network, i.networkingOpts, srv.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -570,17 +570,17 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*S
 	return &serverList[0], nil
 }
 
+type Address struct {
+	IPType string `mapstructure:"OS-EXT-IPS:type"`
+	Addr   string
+}
+
 // IP addresses order:
 // * interfaces private IPs
 // * access IPs
 // * metadata hostname
 // * server object Addresses (floating type)
 func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) {
-	type Address struct {
-		IPType string `mapstructure:"OS-EXT-IPS:type"`
-		Addr   string
-	}
-
 	addrs := []v1.NodeAddress{}
 
 	// parse private IP addresses first in an ordered manner
@@ -596,7 +596,7 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
 							Address: fixedIP.IPAddress,
 						},
 					)
-					if port.NetworkID != "" {
+					if port.NetworkID != "" && networkingOpts.TrunkSupportEnabled {
 						addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
 						allPrivates[port.NetworkID] = append(allPrivates[port.NetworkID], addr)
 					}
@@ -640,39 +640,10 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
 		return nil, err
 	}
 
-	// Get the private networks that are not directly connected
-	if len(addresses) < len(allPrivates) {
-		extraPrivates := make(map[string][]Address)
-		// For each private network
-		for network, interfaceAddresses := range allPrivates {
-			found := false
-			// For each address in the private network
-			for _, interfaceAddress := range interfaceAddresses {
-				// Check if the address is directly assigned
-				for _, srvAddresses := range addresses {
-					for _, srvAddress := range srvAddresses {
-						if interfaceAddress.Addr == srvAddress.Addr {
-							found = true
-							break
-						}
-					}
-				}
-			}
-			// All the addresses in the private network are not directly assigned
-			// Save the private network
-			if !found {
-				extraPrivates[network] = interfaceAddresses
-			}
-		}
-		klog.V(5).Infof("Node '%s' extra private interfaces '%s'", srv.Name, extraPrivates)
-		for network, interfaceAddresses := range extraPrivates {
-			srvAddresses, ok := addresses[network]
-			if !ok {
-				addresses[network] = interfaceAddresses
-			} else {
-				addresses[network] = append(srvAddresses, interfaceAddresses...)
-			}
-		}
+	// Add the private addresses that are not directly connected
+	if len(addresses) < len(allPrivates) && networkingOpts.TrunkSupportEnabled {
+		numExtraPrivates := addExtraNodeAddresses(addresses, allPrivates)
+		klog.V(5).Infof("Node '%s' is added %d extra private interfaces '%s'", srv.Name, numExtraPrivates, addresses)
 	}
 
 	var networks []string
@@ -728,13 +699,47 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
 	return addrs, nil
 }
 
+// addExtraNodeAddresses addes addresses attached via trunk
+func addExtraNodeAddresses(addresses, allPrivates map[string][]Address) int {
+	extraPrivates := make(map[string][]Address)
+	for network, interfaceAddresses := range allPrivates {
+		found := false
+		// For each address in the private network
+		for _, interfaceAddress := range interfaceAddresses {
+			// Check if the address is directly assigned
+			for _, nodeAddresses := range addresses {
+				for _, nodeAddress := range nodeAddresses {
+					if interfaceAddress.Addr == nodeAddress.Addr {
+						found = true
+						break
+					}
+				}
+			}
+		}
+		// All the addresses in the private network are not directly assigned
+		// Save the private network
+		if !found {
+			extraPrivates[network] = interfaceAddresses
+		}
+	}
+	for network, interfaceAddresses := range extraPrivates {
+		srvAddresses, ok := addresses[network]
+		if !ok {
+			addresses[network] = interfaceAddresses
+		} else {
+			addresses[network] = append(srvAddresses, interfaceAddresses...)
+		}
+	}
+	return len(extraPrivates)
+}
+
 func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) {
 	srv, err := getServerByName(client, name)
 	if err != nil {
 		return nil, err
 	}
 
-	ports, err := getAttachedPorts(client, srv.ID)
+	ports, err := getAttachedPorts(client, networkingOpts, srv.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -743,7 +748,7 @@ 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) ([]ports.Port, error) {
+func getAttachedPorts(client *gophercloud.ServiceClient, networkingOpts NetworkingOpts, serverID string) ([]ports.Port, error) {
 	listOpts := ports.ListOpts{
 		DeviceID:    serverID,
 		DeviceOwner: "compute:nova",
@@ -753,11 +758,13 @@ func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]por
 	if err != nil {
 		return interfaces, err
 	}
-	subInterfaces, err := getSubInterfaces(client, interfaces)
-	if err != nil {
-		return interfaces, err
+	if networkingOpts.TrunkSupportEnabled {
+		subInterfaces, err := getSubInterfaces(client, interfaces)
+		if err != nil {
+			return interfaces, err
+		}
+		interfaces = append(interfaces, subInterfaces...)
 	}
-	interfaces = append(interfaces, subInterfaces...)
 
 	return interfaces, nil
 }

pkg/openstack/instancesv2.go

@@ -123,7 +123,7 @@ func (i *InstancesV2) InstanceMetadata(ctx context.Context, node *v1.Node) (*clo
 		return nil, err
 	}
 
-	ports, err := getAttachedPorts(i.network, server.ID)
+	ports, err := getAttachedPorts(i.network, i.networkingOpts, server.ID)
 	if err != nil {
 		return nil, err
 	}

pkg/openstack/loadbalancer.go

@@ -684,7 +684,7 @@ func getBoolFromServiceAnnotation(service *corev1.Service, annotationKey string,
 }
 
 // getSubnetIDForLB returns subnet-id for a specific node
-func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, preferredIPFamily corev1.IPFamily) (string, error) {
+func getSubnetIDForLB(network *gophercloud.ServiceClient, networkingOpts NetworkingOpts, node corev1.Node, preferredIPFamily corev1.IPFamily) (string, error) {
 	ipAddress, err := nodeAddressForLB(&node, preferredIPFamily)
 	if err != nil {
 		return "", err
@@ -695,7 +695,7 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref
 		instanceID = instanceID[(ind + 1):]
 	}
 
-	ports, err := getAttachedPorts(network, instanceID)
+	ports, err := getAttachedPorts(network, networkingOpts, instanceID)
 	if err != nil {
 		return "", err
 	}
@@ -1531,7 +1531,7 @@ func (lbaas *LbaasV2) checkServiceUpdate(service *corev1.Service, nodes []*corev
 		} else {
 			svcConf.lbMemberSubnetID = getStringFromServiceAnnotation(service, ServiceAnnotationLoadBalancerSubnetID, lbaas.opts.SubnetID)
 			if len(svcConf.lbMemberSubnetID) == 0 && len(nodes) > 0 {
-				subnetID, err := getSubnetIDForLB(lbaas.network, *nodes[0], svcConf.preferredIPFamily)
+				subnetID, err := getSubnetIDForLB(lbaas.network, lbaas.networkingOpts, *nodes[0], svcConf.preferredIPFamily)
 				if err != nil {
 					return fmt.Errorf("no subnet-id found for service %s: %v", serviceName, err)
 				}
@@ -1645,7 +1645,7 @@ func (lbaas *LbaasV2) checkService(service *corev1.Service, nodes []*corev1.Node
 		svcConf.lbMemberSubnetID = svcConf.lbSubnetID
 	}
 	if len(svcConf.lbNetworkID) == 0 && len(svcConf.lbSubnetID) == 0 {
-		subnetID, err := getSubnetIDForLB(lbaas.network, *nodes[0], svcConf.preferredIPFamily)
+		subnetID, err := getSubnetIDForLB(lbaas.network, lbaas.networkingOpts, *nodes[0], svcConf.preferredIPFamily)
 		if err != nil {
 			return fmt.Errorf("failed to get subnet to create load balancer for service %s: %v", serviceName, err)
 		}

pkg/openstack/openstack.go

@@ -67,14 +67,24 @@ 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.")
 }
 
+// NetworkingOpts is used for networking settings
+type NetworkingOpts struct {
+	TrunkSupportEnabled bool     `gcfg:"trunk-support-enabled"`
+	IPv6SupportDisabled bool     `gcfg:"ipv6-support-disabled"`
+	PublicNetworkName   []string `gcfg:"public-network-name"`
+	InternalNetworkName []string `gcfg:"internal-network-name"`
+	AddressSortOrder    string   `gcfg:"address-sort-order"`
+}
+
 // LoadBalancer is used for creating and maintaining load balancers
 type LoadBalancer struct {
-	secret  *gophercloud.ServiceClient
-	network *gophercloud.ServiceClient
-	compute *gophercloud.ServiceClient
-	lb      *gophercloud.ServiceClient
-	opts    LoadBalancerOpts
-	kclient kubernetes.Interface
+	secret         *gophercloud.ServiceClient
+	network        *gophercloud.ServiceClient
+	compute        *gophercloud.ServiceClient
+	lb             *gophercloud.ServiceClient
+	opts           LoadBalancerOpts
+	networkingOpts NetworkingOpts
+	kclient        kubernetes.Interface
 }
 
 // LoadBalancerOpts have the options to talk to Neutron LBaaSV2 or Octavia
@@ -120,14 +130,6 @@ type LBClass struct {
 	MemberSubnetID     string `gcfg:"member-subnet-id,omitempty"`
 }
 
-// NetworkingOpts is used for networking settings
-type NetworkingOpts struct {
-	IPv6SupportDisabled bool     `gcfg:"ipv6-support-disabled"`
-	PublicNetworkName   []string `gcfg:"public-network-name"`
-	InternalNetworkName []string `gcfg:"internal-network-name"`
-	AddressSortOrder    string   `gcfg:"address-sort-order"`
-}
-
 // RouterOpts is used for Neutron routes
 type RouterOpts struct {
 	RouterID string `gcfg:"router-id"`
@@ -363,7 +365,7 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
 
 	klog.V(1).Info("Claiming to support LoadBalancer")
 
-	return &LbaasV2{LoadBalancer{secret, network, compute, lb, os.lbOpts, os.kclient}}, true
+	return &LbaasV2{LoadBalancer{secret, network, compute, lb, os.lbOpts, os.networkingOpts, os.kclient}}, true
 }
 
 // Zones indicates that we support zones

pkg/openstack/openstack_test.go

@@ -1094,6 +1094,7 @@ func TestNodeAddressesWithSubports(t *testing.T) {
 	}
 
 	networkingOpts := NetworkingOpts{
+		TrunkSupportEnabled: true,
 		InternalNetworkName: []string{"mycluster-01-vlan701_network", "mycluster-01-vlan701_network2"},
 	}