Change names

Author: komer3

cloud/linode/cloud.go

@@ -39,17 +39,17 @@ var Options struct {
 	EnableRouteController    bool
 	EnableTokenHealthChecker bool
 	// Deprecated: use VPCNames instead
-	VPCName                 string
-	VPCNames                string
-	SubnetNames             string
-	LoadBalancerType        string
-	BGPNodeSelector         string
-	IpHolderSuffix          string
-	LinodeExternalNetwork   *net.IPNet
-	NodeBalancerTags        []string
-	DefaultNBType           string
-	GlobalStopChannel       chan<- struct{}
-	UseIPv6ForLoadBalancers bool
+	VPCName                    string
+	VPCNames                   string
+	SubnetNames                string
+	LoadBalancerType           string
+	BGPNodeSelector            string
+	IpHolderSuffix             string
+	LinodeExternalNetwork      *net.IPNet
+	NodeBalancerTags           []string
+	DefaultNBType              string
+	GlobalStopChannel          chan<- struct{}
+	EnableIPv6ForLoadBalancers bool
 }
 
 type linodeCloud struct {

cloud/linode/loadbalancers.go

@@ -1004,7 +1004,7 @@ func makeLoadBalancerStatus(service *v1.Service, nb *linodego.NodeBalancer) *v1.
 	}
 
 	// Check for per-service IPv6 annotation first, then fall back to global setting
-	useIPv6 := getServiceBoolAnnotation(service, annotations.AnnLinodeEnableIPv6Ingress) || Options.UseIPv6ForLoadBalancers
+	useIPv6 := getServiceBoolAnnotation(service, annotations.AnnLinodeEnableIPv6Ingress) || Options.EnableIPv6ForLoadBalancers
 
 	// When IPv6 is enabled (either per-service or globally), include both IPv4 and IPv6
 	if useIPv6 && nb.IPv6 != nil && *nb.IPv6 != "" {

cloud/linode/loadbalancers_test.go

@@ -3100,8 +3100,8 @@ func testMakeLoadBalancerStatusWithIPv6(t *testing.T, client *linodego.Client, _
 		},
 	}
 
-	// Test with UseIPv6ForLoadBalancers = false (default)
-	Options.UseIPv6ForLoadBalancers = false
+	// Test with EnableIPv6ForLoadBalancers = false (default)
+	Options.EnableIPv6ForLoadBalancers = false
 	expectedStatus := &v1.LoadBalancerStatus{
 		Ingress: []v1.LoadBalancerIngress{{
 			Hostname: hostname,
@@ -3110,11 +3110,11 @@ func testMakeLoadBalancerStatusWithIPv6(t *testing.T, client *linodego.Client, _
 	}
 	status := makeLoadBalancerStatus(svc, nb)
 	if !reflect.DeepEqual(status, expectedStatus) {
-		t.Errorf("expected status with UseIPv6ForLoadBalancers=false to be %#v; got %#v", expectedStatus, status)
+		t.Errorf("expected status with EnableIPv6ForLoadBalancers=false to be %#v; got %#v", expectedStatus, status)
 	}
 
-	// Test with UseIPv6ForLoadBalancers = true
-	Options.UseIPv6ForLoadBalancers = true
+	// Test with EnableIPv6ForLoadBalancers = true
+	Options.EnableIPv6ForLoadBalancers = true
 	expectedStatus = &v1.LoadBalancerStatus{
 		Ingress: []v1.LoadBalancerIngress{
 			{
@@ -3129,12 +3129,12 @@ func testMakeLoadBalancerStatusWithIPv6(t *testing.T, client *linodego.Client, _
 	}
 	status = makeLoadBalancerStatus(svc, nb)
 	if !reflect.DeepEqual(status, expectedStatus) {
-		t.Errorf("expected status with UseIPv6ForLoadBalancers=true to be %#v; got %#v", expectedStatus, status)
+		t.Errorf("expected status with EnableIPv6ForLoadBalancers=true to be %#v; got %#v", expectedStatus, status)
 	}
 
 	// Test with per-service annotation
 	// Reset the global flag to false and set the annotation
-	Options.UseIPv6ForLoadBalancers = false
+	Options.EnableIPv6ForLoadBalancers = false
 	svc.Annotations[annotations.AnnLinodeEnableIPv6Ingress] = "true"
 
 	// Expect the same result as when the global flag is enabled
@@ -3145,7 +3145,7 @@ func testMakeLoadBalancerStatusWithIPv6(t *testing.T, client *linodego.Client, _
 	}
 
 	// Reset the flag to its default value
-	Options.UseIPv6ForLoadBalancers = false
+	Options.EnableIPv6ForLoadBalancers = false
 }
 
 func testMakeLoadBalancerStatusEnvVar(t *testing.T, client *linodego.Client, _ *fakeAPI) {

deploy/chart/templates/daemonset.yaml

@@ -100,8 +100,8 @@ spec:
             {{- if .Values.defaultNBType }}
             - --default-nodebalancer-type={{ .Values.defaultNBType }}
             {{- end }}
-            {{- if .Values.useIPv6ForLoadBalancers }}
-            - --use-ipv6-for-loadbalancers=true
+            {{- if .Values.enableIPv6ForLoadBalancers }}
+            - --enable-ipv6-for-loadbalancers=true
             {{- end }}
           {{- with .Values.containerSecurityContext }}
           securityContext:

deploy/chart/values.yaml

@@ -89,7 +89,7 @@ tolerations:
 # Enable IPv6 ingress addresses for LoadBalancer services
 # When enabled, both IPv4 and IPv6 addresses will be included in the LoadBalancer status for all services
 # This can also be controlled per-service using the "service.beta.kubernetes.io/linode-loadbalancer-enable-ipv6-ingress" annotation
-# useIPv6ForLoadBalancers: true
+# enableIPv6ForLoadBalancers: true
 
 # This section adds the ability to pass environment variables to adjust CCM defaults
 # https://github.com/linode/linode-cloud-controller-manager/blob/master/cloud/linode/loadbalancers.go

docs/configuration/environment.md

@@ -44,7 +44,7 @@ The CCM supports the following flags:
 | `--ip-holder-suffix` | `""` | Suffix to append to the IP holder name when using shared IP fail-over with BGP |
 | `--default-nodebalancer-type` | `common` | Default type of NodeBalancer to create (options: common, premium) |
 | `--nodebalancer-tags` | `[]` | Linode tags to apply to all NodeBalancers |
-| `--use-ipv6-for-loadbalancers` | `false` | Set both IPv4 and IPv6 addresses for all LoadBalancer services (when disabled, only IPv4 is used) |
+| `--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. |
 
 ## Configuration Methods
 
@@ -55,7 +55,7 @@ env:
   - name: LINODE_INSTANCE_CACHE_TTL
     value: "30"
 args:
-  - --use-ipv6-for-loadbalancers
+  - --enable-ipv6-for-loadbalancers
   - --enable-route-controller
 ```
 
@@ -71,7 +71,7 @@ spec:
             - name: LINODE_INSTANCE_CACHE_TTL
               value: "30"
           args:
-            - --use-ipv6-for-loadbalancers
+            - --enable-ipv6-for-loadbalancers
             - --enable-route-controller
 ```
 

docs/configuration/loadbalancer.md

@@ -20,7 +20,9 @@ For more details, see [Linode NodeBalancer Documentation](https://www.linode.com
 
 ### IPv6 Support
 
-NodeBalancers support both IPv4 and IPv6 ingress addresses. By default, the CCM uses sets IPv4 address for LoadBalancer services. You can configure the CCM to set both IPv4 and IPv6 addresses by setting the `use-ipv6-for-loadbalancers` flag:
+NodeBalancers support both IPv4 and IPv6 ingress addresses. By default, the CCM uses only IPv4 address for LoadBalancer services. 
+
+You can enable IPv6 addresses globally for all services by setting the `enable-ipv6-for-loadbalancers` flag:
 
 ```yaml
 spec:
@@ -29,7 +31,7 @@ spec:
       containers:
         - name: ccm-linode
           args:
-            - --use-ipv6-for-loadbalancers
+            - --enable-ipv6-for-loadbalancers=true
 ```
 
 Alternatively, you can enable IPv6 addresses for individual services using the annotation:

main.go

@@ -91,7 +91,7 @@ func main() {
 	command.Flags().StringVar(&linode.Options.IpHolderSuffix, "ip-holder-suffix", "", "suffix to append to the ip holder name when using shared IP fail-over with BGP (e.g. ip-holder-suffix=my-cluster-name")
 	command.Flags().StringVar(&linode.Options.DefaultNBType, "default-nodebalancer-type", string(linodego.NBTypeCommon), "default type of NodeBalancer to create (options: common, premium)")
 	command.Flags().StringSliceVar(&linode.Options.NodeBalancerTags, "nodebalancer-tags", []string{}, "Linode tags to apply to all NodeBalancers")
-	command.Flags().BoolVar(&linode.Options.UseIPv6ForLoadBalancers, "use-ipv6-for-loadbalancers", false, "set both IPv4 and IPv6 addresses for all LoadBalancer services (when disabled, only IPv4 is used)")
+	command.Flags().BoolVar(&linode.Options.EnableIPv6ForLoadBalancers, "enable-ipv6-for-loadbalancers", false, "set both IPv4 and IPv6 addresses for all LoadBalancer services (when disabled, only IPv4 is used)")
 
 	// Set static flags
 	command.Flags().VisitAll(func(fl *pflag.Flag) {