Remove the feature activation flags in all files.

Author: Jing Zhang

pkg/openstack/instances.go

@@ -236,7 +236,7 @@ func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID st
 		return []v1.NodeAddress{}, err
 	}
 
-	ports, err := getAttachedPorts(i.network, i.networkingOpts, server.ID)
+	ports, err := getAttachedPorts(i.network, server.ID)
 	if err != nil {
 		return []v1.NodeAddress{}, err
 	}
@@ -342,7 +342,7 @@ func (i *Instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
 		return nil, err
 	}
 
-	ports, err := getAttachedPorts(i.network, i.networkingOpts, srv.ID)
+	ports, err := getAttachedPorts(i.network, srv.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -595,7 +595,7 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
 							Address: fixedIP.IPAddress,
 						},
 					)
-					if port.NetworkID != "" && networkingOpts.TrunkSupportEnabled {
+					if port.NetworkID != "" {
 						addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
 						allPrivates[port.NetworkID] = append(allPrivates[port.NetworkID], addr)
 					}
@@ -738,7 +738,7 @@ func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName,
 		return nil, err
 	}
 
-	ports, err := getAttachedPorts(client, networkingOpts, srv.ID)
+	ports, err := getAttachedPorts(client, srv.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -747,7 +747,7 @@ func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName,
 }
 
 // getAttachedPorts returns a list of ports attached to a server.
-func getAttachedPorts(client *gophercloud.ServiceClient, networkingOpts NetworkingOpts, serverID string) ([]ports.Port, error) {
+func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]ports.Port, error) {
 	listOpts := ports.ListOpts{
 		DeviceID:    serverID,
 		DeviceOwner: "compute:nova",

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, i.networkingOpts, server.ID)
+	ports, err := getAttachedPorts(i.network, 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, networkingOpts NetworkingOpts, node corev1.Node, preferredIPFamily corev1.IPFamily) (string, error) {
+func getSubnetIDForLB(network *gophercloud.ServiceClient, 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, networkingOpts Network
 		instanceID = instanceID[(ind + 1):]
 	}
 
-	ports, err := getAttachedPorts(network, networkingOpts, instanceID)
+	ports, err := getAttachedPorts(network, 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, lbaas.networkingOpts, *nodes[0], svcConf.preferredIPFamily)
+				subnetID, err := getSubnetIDForLB(lbaas.network, *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, lbaas.networkingOpts, *nodes[0], svcConf.preferredIPFamily)
+		subnetID, err := getSubnetIDForLB(lbaas.network, *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,24 +67,14 @@ 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
-	networkingOpts NetworkingOpts
-	kclient        kubernetes.Interface
+	secret  *gophercloud.ServiceClient
+	network *gophercloud.ServiceClient
+	compute *gophercloud.ServiceClient
+	lb      *gophercloud.ServiceClient
+	opts    LoadBalancerOpts
+	kclient kubernetes.Interface
 }
 
 // LoadBalancerOpts have the options to talk to Neutron LBaaSV2 or Octavia
@@ -130,6 +120,14 @@ 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"`
@@ -365,7 +363,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.networkingOpts, os.kclient}}, true
+	return &LbaasV2{LoadBalancer{secret, network, compute, lb, os.lbOpts, os.kclient}}, true
 }
 
 // Zones indicates that we support zones

pkg/openstack/openstack_test.go

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