Skip to content

Commit 891cd2e

Browse files
Add dash after prefix
1 parent f958bc3 commit 891cd2e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

cloud/linode/cloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ type linodeCloud struct {
7272
var (
7373
instanceCache *instances
7474
ipHolderCharLimit int = 23
75-
LoadBalancerPrefixCharLimit int = 20
75+
LoadBalancerPrefixCharLimit int = 19
7676
)
7777

7878
func init() {

cloud/linode/cloud_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ func TestNewCloud(t *testing.T) {
127127
assert.Error(t, err, "expected error if ipholdersuffix is longer than 23 chars")
128128
})
129129

130-
t.Run("should fail if load-balancer-prefix is longer than 20 chars", func(t *testing.T) {
130+
t.Run("should fail if load-balancer-prefix is longer than 19 chars", func(t *testing.T) {
131131
prefix := Options.LoadBalancerPrefix
132132
Options.LoadBalancerPrefix = strings.Repeat("a", 21)
133133
defer func() {
134134
Options.LoadBalancerPrefix = prefix
135135
}()
136136
_, err := newCloud()
137-
assert.Error(t, err, "expected error if load-balancer-prefix is longer than 20 chars")
137+
assert.Error(t, err, "expected error if load-balancer-prefix is longer than 19 chars")
138138
})
139139
}
140140

cloud/linode/loadbalancers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func (l *loadbalancers) cleanupOldNodeBalancer(ctx context.Context, service *v1.
227227
// GetLoadBalancer will not modify service.
228228
func (l *loadbalancers) GetLoadBalancerName(_ context.Context, _ string, _ *v1.Service) string {
229229
unixNano := strconv.FormatInt(time.Now().UnixNano(), 16)
230-
return fmt.Sprintf("%s%s", Options.LoadBalancerPrefix, unixNano[len(unixNano)-12:])
230+
return fmt.Sprintf("%s-%s", Options.LoadBalancerPrefix, unixNano[len(unixNano)-12:])
231231
}
232232

233233
// GetLoadBalancer returns the *v1.LoadBalancerStatus of service.

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func main() {
9898
command.Flags().IntVar(&linode.Options.NodeBalancerBackendIPv4SubnetID, "nodebalancer-backend-ipv4-subnet-id", 0, "ipv4 subnet id to use for NodeBalancer backends")
9999
command.Flags().StringVar(&linode.Options.NodeBalancerBackendIPv4SubnetName, "nodebalancer-backend-ipv4-subnet-name", "", "ipv4 subnet name to use for NodeBalancer backends")
100100
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)")
101-
command.Flags().StringVar(&linode.Options.LoadBalancerPrefix, "load-balancer-prefix", "ccm-", "Name prefix for LoadBalancers. (max. 20 char.)")
101+
command.Flags().StringVar(&linode.Options.LoadBalancerPrefix, "load-balancer-prefix", "ccm", "Name prefix for LoadBalancers. (max. 19 char.)")
102102

103103
// Set static flags
104104
command.Flags().VisitAll(func(fl *pflag.Flag) {

0 commit comments

Comments
 (0)