Change name of flag to nodebalacer-prefix

Author: adamginna-akamai

cloud/linode/cloud.go

@@ -58,7 +58,7 @@ var Options struct {
 	ClusterCIDRIPv4                   string
 	NodeCIDRMaskSizeIPv4              int
 	NodeCIDRMaskSizeIPv6              int
-	LoadBalancerPrefix                string
+	NodeBalancerPrefix                string
 }
 
 type linodeCloud struct {
@@ -72,7 +72,7 @@ type linodeCloud struct {
 var (
 	instanceCache     *instances
 	ipHolderCharLimit int = 23
-	LoadBalancerPrefixCharLimit int = 19
+	NodeBalancerPrefixCharLimit int = 19
 )
 
 func init() {
@@ -195,8 +195,8 @@ func newCloud() (cloudprovider.Interface, error) {
 		return nil, fmt.Errorf("%s", msg)
 	}
 
-	if len(Options.LoadBalancerPrefix) > LoadBalancerPrefixCharLimit { 
-		msg := fmt.Sprintf("load-balancer-prefix must be %d characters or less: %s is %d characters\n", LoadBalancerPrefixCharLimit, Options.LoadBalancerPrefix, len(Options.LoadBalancerPrefix))
+	if len(Options.NodeBalancerPrefix) > NodeBalancerPrefixCharLimit { 
+		msg := fmt.Sprintf("nodebalancer-prefix must be %d characters or less: %s is %d characters\n", NodeBalancerPrefixCharLimit, Options.NodeBalancerPrefix, len(Options.NodeBalancerPrefix))
 		klog.Error(msg)
 		return nil, fmt.Errorf("%s", msg)
 	}

cloud/linode/cloud_test.go

@@ -127,14 +127,14 @@ func TestNewCloud(t *testing.T) {
 		assert.Error(t, err, "expected error if ipholdersuffix is longer than 23 chars")
 	})
 
-	t.Run("should fail if load-balancer-prefix is longer than 19 chars", func(t *testing.T) {
-		prefix := Options.LoadBalancerPrefix
-		Options.LoadBalancerPrefix = strings.Repeat("a", 21)
+	t.Run("should fail if nodebalancer-prefix is longer than 19 chars", func(t *testing.T) {
+		prefix := Options.NodeBalancerPrefix
+		Options.NodeBalancerPrefix = strings.Repeat("a", 21)
 		defer func() {
-			Options.LoadBalancerPrefix = prefix
+			Options.NodeBalancerPrefix = prefix
 		}()
 		_, err := newCloud()
-		assert.Error(t, err, "expected error if load-balancer-prefix is longer than 19 chars")
+		assert.Error(t, err, "expected error if nodebalancer-prefix is longer than 19 chars")
 	})
 }
 

cloud/linode/loadbalancers.go

@@ -227,7 +227,7 @@ func (l *loadbalancers) cleanupOldNodeBalancer(ctx context.Context, service *v1.
 // GetLoadBalancer will not modify service.
 func (l *loadbalancers) GetLoadBalancerName(_ context.Context, _ string, _ *v1.Service) string {
 	unixNano := strconv.FormatInt(time.Now().UnixNano(), 16)
-	return fmt.Sprintf("%s-%s", Options.LoadBalancerPrefix, unixNano[len(unixNano)-12:])
+	return fmt.Sprintf("%s-%s", Options.NodeBalancerPrefix, unixNano[len(unixNano)-12:])
 }
 
 // GetLoadBalancer returns the *v1.LoadBalancerStatus of service.

docs/configuration/environment.md

@@ -53,6 +53,7 @@ The CCM supports the following flags:
 | `--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 |
+| `--nodebalancer-prefix` | `ccm` | Name prefix for LoadBalancers. (max. 19 char.) |
 
 ## Configuration Methods
 

main.go

@@ -98,7 +98,7 @@ func main() {
 	command.Flags().IntVar(&linode.Options.NodeBalancerBackendIPv4SubnetID, "nodebalancer-backend-ipv4-subnet-id", 0, "ipv4 subnet id to use for NodeBalancer backends")
 	command.Flags().StringVar(&linode.Options.NodeBalancerBackendIPv4SubnetName, "nodebalancer-backend-ipv4-subnet-name", "", "ipv4 subnet name to use for NodeBalancer backends")
 	command.Flags().BoolVar(&linode.Options.DisableNodeBalancerVPCBackends, "disable-nodebalancer-vpc-backends", false, "disables nodebalancer backends in VPCs (when enabled, nodebalancers will only have private IPs as backends for backward compatibility)")
-	command.Flags().StringVar(&linode.Options.LoadBalancerPrefix, "load-balancer-prefix", "ccm", "Name prefix for LoadBalancers. (max. 19 char.)")
+	command.Flags().StringVar(&linode.Options.NodeBalancerPrefix, "nodebalancer-prefix", "ccm", "Name prefix for LoadBalancers. (max. 19 char.)")
 
 	// Set static flags
 	command.Flags().VisitAll(func(fl *pflag.Flag) {