address review comments

Author: Rahul Sharma

cloud/linode/cloud.go

@@ -160,12 +160,13 @@ func newCloud() (cloudprovider.Interface, error) {
 	if Options.DisableNodeBalancerVPCBackends {
 		klog.Infof("NodeBalancer VPC backends are disabled, no VPC backends will be created for NodeBalancers")
 		Options.NodeBalancerBackendIPv4SubnetID = 0
+		Options.NodeBalancerBackendIPv4SubnetName = ""
 	} else if Options.NodeBalancerBackendIPv4SubnetName != "" {
 		Options.NodeBalancerBackendIPv4SubnetID, err = getNodeBalancerBackendIPv4SubnetID(linodeClient)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get backend IPv4 subnet ID for subnet name %s: %w", Options.NodeBalancerBackendIPv4SubnetName, err)
 		}
-		klog.Infof("Using NodeBalancer backend IPv4 subnet ID %d for subnet name %s\n", Options.NodeBalancerBackendIPv4SubnetID, Options.NodeBalancerBackendIPv4SubnetName)
+		klog.Infof("Using NodeBalancer backend IPv4 subnet ID %d for subnet name %s", Options.NodeBalancerBackendIPv4SubnetID, Options.NodeBalancerBackendIPv4SubnetName)
 	}
 
 	instanceCache = newInstances(linodeClient)

cloud/linode/loadbalancers.go

@@ -1177,7 +1177,7 @@ func getPortConfigAnnotation(service *v1.Service, port int) (portConfigAnnotatio
 // getNodePrivateIP provides the Linode Backend IP the NodeBalancer will communicate with.
 // If CCM runs within VPC and DisableNodeBalancerVPCBackends is set to false, it will
 // use NodeInternalIP of node.
-// For services outside of VPC, it will use linode specific pirvate IP address
+// For services outside of VPC, it will use linode specific private IP address
 // Backend IP can be overwritten to the one specified using AnnLinodeNodePrivateIP
 // annotation over the NodeInternalIP.
 func getNodePrivateIP(node *v1.Node, subnetID int) string {

cloud/linode/vpc_test.go

@@ -225,13 +225,19 @@ func TestGetSubnetID(t *testing.T) {
 	})
 }
 
-func Test_getNodeBalancerBackendIPv4SubnetID(t *testing.T) {
+func TestGetNodeBalancerBackendIPv4SubnetID(t *testing.T) {
 	t.Run("VPC not found", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 		client := mocks.NewMockClient(ctrl)
 		currVPCNames := Options.VPCNames
-		defer func() { Options.VPCNames = currVPCNames }()
+		currVPCIDs := vpcIDs
+		currSubnetIDs := subnetIDs
+		defer func() {
+			Options.VPCNames = currVPCNames
+			vpcIDs = currVPCIDs
+			subnetIDs = currSubnetIDs
+		}()
 		Options.VPCNames = "vpc-test1,vpc-test2,vpc-test3"
 		vpcIDs = map[string]int{"vpc-test2": 2, "vpc-test3": 3}
 		subnetIDs = map[string]int{"test1": 1, "test2": 2, "test3": 3}

deploy/chart/templates/daemonset.yaml

@@ -90,16 +90,19 @@ spec:
             {{- if and .Values.routeController .Values.routeController.subnetNames }}
             {{- $subnetNames = .Values.routeController.subnetNames }}
             {{- end }}
+            {{- if .Values.disableNodeBalancerVPCBackends }}
+            - --disable-nodebalancer-vpc-backends={{ .Values.disableNodeBalancerVPCBackends }}
+            {{- end }}
             {{- $nbvpcBackendIpv4SubnetName := .Values.nodeBalancerBackendIpv4SubnetName }}
             {{- $nbvpcBackendIpv4SubnetID := .Values.nodeBalancerBackendIpv4SubnetID }}
             {{- if and $nbvpcBackendIpv4SubnetName $nbvpcBackendIpv4SubnetID }}
             {{- fail "Both nodeBalancerBackendIpv4SubnetName and nodeBalancerBackendIpv4SubnetID are set. Please use only one." }}
             {{- end }}
             {{- if $nbvpcBackendIpv4SubnetName }}
-            - --node-balancer-backend-ipv4-subnet-name={{ $nbvpcBackendIpv4SubnetName }}
+            - --nodebalancer-backend-ipv4-subnet-name={{ $nbvpcBackendIpv4SubnetName }}
             {{- end }}
             {{- if $nbvpcBackendIpv4SubnetID }}
-            - --node-balancer-backend-ipv4-subnet-id={{ $nbvpcBackendIpv4SubnetID }}
+            - --nodebalancer-backend-ipv4-subnet-id={{ $nbvpcBackendIpv4SubnetID }}
             {{- end }}
             {{- if .Values.routeController }}
             - --enable-route-controller=true

deploy/chart/values.yaml

@@ -97,6 +97,10 @@ tolerations:
 # This can also be controlled per-service using the "service.beta.kubernetes.io/linode-loadbalancer-enable-ipv6-ingress" annotation
 # enableIPv6ForLoadBalancers: true
 
+# disableNodeBalancerVPCBackends is used to disable the use of VPC backends for NodeBalancers.
+# When set to true, NodeBalancers will use linode private IPs for backends instead of VPC IPs.
+# disableNodeBalancerVPCBackends: false
+
 # nodeBalancerBackendIPv4Subnet is the subnet to use for the backend ips of the NodeBalancer
 # nodeBalancerBackendIPv4Subnet: ""
 

docs/configuration/environment.md

@@ -49,7 +49,7 @@ The CCM supports the following flags:
 | `--nodebalancer-backend-ipv4-subnet` | `""` | ipv4 subnet to use for NodeBalancer backends |
 | `--nodebalancer-backend-ipv4-subnet-id` | `""` | ipv4 subnet id to use for NodeBalancer backends |
 | `--nodebalancer-backend-ipv4-subnet-name` | `""` | ipv4 subnet name to use for NodeBalancer backends |
-| `--disable-nodebalancer-vpc-backends` | `false` | use VPC specific ip-addresses for nodebalancer backend ips when running in VPC (set to `true` only for backward compatibility if needed) |
+| `--disable-nodebalancer-vpc-backends` | `false` | don't use VPC specific ip-addresses for nodebalancer backend ips when running in VPC (set to `true` for backward compatibility if needed) |
 | `--enable-ipv6-for-loadbalancers` | `false` | Set both IPv4 and IPv6 addresses for all LoadBalancer services (when disabled, only IPv4 is used). This can also be configured per-service using the `service.beta.kubernetes.io/linode-loadbalancer-enable-ipv6-ingress` annotation. |
 | `--node-cidr-mask-size-ipv4` | `24` | ipv4 cidr mask size for pod cidrs allocated to nodes |
 | `--node-cidr-mask-size-ipv6` | `64` | ipv6 cidr mask size for pod cidrs allocated to nodes |
@@ -107,7 +107,7 @@ To use dedicated subnet within VPC for nodebalancer backend ips, one can use one
 
 If no specific subnet is specified, by default, CCM will use the `default` subnet or the first subnet configured in `--subnet-names` flag for nodebalancer backend ips
 
-`--disable-nodebalancer-vpc-backends` disables using VPC specific ips as nodebalancer backends and relies on machines to have linode specific [private addresses](https://techdocs.akamai.com/cloud-computing/docs/managing-ip-addresses-on-a-compute-instance#ipv4). In future, this flag might get removed as this is added for backward compatibility for now. We encourage users not to use this flag if possible.
+`--disable-nodebalancer-vpc-backends` when set to `true` disables using VPC specific ips as nodebalancer backends and relies on machines to have linode specific [private addresses](https://techdocs.akamai.com/cloud-computing/docs/managing-ip-addresses-on-a-compute-instance#ipv4). In future, this flag might get removed as this is added for backward compatibility for now. We encourage users not to use this flag if possible.
 
 `--nodebalancer-backend-ipv4-subnet` can be used to make sure if nodebalancer backend ips are manually specified in service annotation, they lie within the specified subnet range.