diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go index fab3e4f112f..752b3ecd509 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go @@ -65,7 +65,7 @@ const ( nodeLabelRole = "kubernetes.io/role" nicFailedState = "Failed" - storageAccountNameMaxLength = 24 + storageAccountNameMaxLength = 24 frontendIPConfigNameMaxLength = 80 loadBalancerRuleNameMaxLength = 80 ) @@ -283,10 +283,10 @@ func (az *Cloud) getLoadBalancerRuleName(service *v1.Service, protocol v1.Protoc return ruleName } - // Load balancer rule name must be less or equal to 80 charactors, so excluding the hyphen two segments cannot exceed 79 + // Load balancer rule name must be less or equal to 80 characters, so excluding the hyphen two segments cannot exceed 79 subnetSegment := *subnet - if len(ruleName) + len(subnetSegment) + 1 > loadBalancerRuleNameMaxLength { - subnetSegment = subnetSegment[:loadBalancerRuleNameMaxLength - len(ruleName) - 1] + if len(ruleName)+len(subnetSegment)+1 > loadBalancerRuleNameMaxLength { + subnetSegment = subnetSegment[:loadBalancerRuleNameMaxLength-len(ruleName)-1] } return fmt.Sprintf("%s-%s-%s-%d", prefix, subnetSegment, protocol, port) @@ -332,8 +332,8 @@ func (az *Cloud) getFrontendIPConfigName(service *v1.Service) string { subnetName := subnet(service) if subnetName != nil { ipcName := fmt.Sprintf("%s-%s", baseName, *subnetName) - - // Azure lb front end configuration name must not exceed 80 charactors + + // Azure lb front end configuration name must not exceed 80 characters if len(ipcName) > frontendIPConfigNameMaxLength { ipcName = ipcName[:frontendIPConfigNameMaxLength] } diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go index c8805fb75d3..e6bc513f1f4 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go @@ -19,8 +19,8 @@ limitations under the License. package azure import ( - "testing" "strconv" + "testing" "github.com/stretchr/testify/assert" @@ -261,13 +261,13 @@ func TestGetLoadBalancingRuleName(t *testing.T) { svc := &v1.Service{ ObjectMeta: meta.ObjectMeta{ - Annotations: map[string]string{ }, - UID: "257b9655-5137-4ad2-b091-ef3f07043ad3", + Annotations: map[string]string{}, + UID: "257b9655-5137-4ad2-b091-ef3f07043ad3", }, } cases := []struct { - description string + description string subnetName string isInternal bool useStandardLB bool @@ -276,49 +276,49 @@ func TestGetLoadBalancingRuleName(t *testing.T) { expected string }{ { - description: "internal lb should have subnet name on the rule name", - subnetName: "shortsubnet", - isInternal: true, - useStandardLB: true, - protocol: v1.ProtocolTCP, - port: 9000, - expected: "a257b965551374ad2b091ef3f07043ad-shortsubnet-TCP-9000", + description: "internal lb should have subnet name on the rule name", + subnetName: "shortsubnet", + isInternal: true, + useStandardLB: true, + protocol: v1.ProtocolTCP, + port: 9000, + expected: "a257b965551374ad2b091ef3f07043ad-shortsubnet-TCP-9000", }, { - description: "internal standard lb should have subnet name on the rule name but truncated to 80 charactors", - subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", - isInternal: true, - useStandardLB: true, - protocol: v1.ProtocolTCP, - port: 9000, - expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnngg-TCP-9000", + description: "internal standard lb should have subnet name on the rule name but truncated to 80 characters", + subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", + isInternal: true, + useStandardLB: true, + protocol: v1.ProtocolTCP, + port: 9000, + expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnngg-TCP-9000", }, { - description: "internal basic lb should have subnet name on the rule name but truncated to 80 charactors", - subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", - isInternal: true, - useStandardLB: false, - protocol: v1.ProtocolTCP, - port: 9000, - expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnngg-TCP-9000", + description: "internal basic lb should have subnet name on the rule name but truncated to 80 characters", + subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", + isInternal: true, + useStandardLB: false, + protocol: v1.ProtocolTCP, + port: 9000, + expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnngg-TCP-9000", }, { - description: "external standard lb should not have subnet name on the rule name", - subnetName: "shortsubnet", - isInternal: false, - useStandardLB: true, - protocol: v1.ProtocolTCP, - port: 9000, - expected: "a257b965551374ad2b091ef3f07043ad-TCP-9000", + description: "external standard lb should not have subnet name on the rule name", + subnetName: "shortsubnet", + isInternal: false, + useStandardLB: true, + protocol: v1.ProtocolTCP, + port: 9000, + expected: "a257b965551374ad2b091ef3f07043ad-TCP-9000", }, { - description: "external basic lb should not have subnet name on the rule name", - subnetName: "shortsubnet", - isInternal: false, - useStandardLB: false, - protocol: v1.ProtocolTCP, - port: 9000, - expected: "a257b965551374ad2b091ef3f07043ad-TCP-9000", + description: "external basic lb should not have subnet name on the rule name", + subnetName: "shortsubnet", + isInternal: false, + useStandardLB: false, + protocol: v1.ProtocolTCP, + port: 9000, + expected: "a257b965551374ad2b091ef3f07043ad-TCP-9000", }, } @@ -351,46 +351,46 @@ func TestGetFrontendIPConfigName(t *testing.T) { } cases := []struct { - description string + description string subnetName string isInternal bool useStandardLB bool expected string }{ { - description: "internal lb should have subnet name on the frontend ip configuration name", - subnetName: "shortsubnet", - isInternal: true, - useStandardLB: true, - expected: "a257b965551374ad2b091ef3f07043ad-shortsubnet", + description: "internal lb should have subnet name on the frontend ip configuration name", + subnetName: "shortsubnet", + isInternal: true, + useStandardLB: true, + expected: "a257b965551374ad2b091ef3f07043ad-shortsubnet", }, { - description: "internal standard lb should have subnet name on the frontend ip configuration name but truncated to 80 charactors", - subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", - isInternal: true, - useStandardLB: true, - expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnnggggggggggg", + description: "internal standard lb should have subnet name on the frontend ip configuration name but truncated to 80 characters", + subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", + isInternal: true, + useStandardLB: true, + expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnnggggggggggg", }, { - description: "internal basic lb should have subnet name on the frontend ip configuration name but truncated to 80 charactors", - subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", - isInternal: true, - useStandardLB: false, - expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnnggggggggggg", + description: "internal basic lb should have subnet name on the frontend ip configuration name but truncated to 80 characters", + subnetName: "averylonnnngggnnnnnnnnnnnnnnnnnnnnnngggggggggggggggggggggggggggggggggggggsubet", + isInternal: true, + useStandardLB: false, + expected: "a257b965551374ad2b091ef3f07043ad-averylonnnngggnnnnnnnnnnnnnnnnnnnnnnggggggggggg", }, { - description: "external standard lb should not have subnet name on the frontend ip configuration name", - subnetName: "shortsubnet", - isInternal: false, - useStandardLB: true, - expected: "a257b965551374ad2b091ef3f07043ad", + description: "external standard lb should not have subnet name on the frontend ip configuration name", + subnetName: "shortsubnet", + isInternal: false, + useStandardLB: true, + expected: "a257b965551374ad2b091ef3f07043ad", }, { - description: "external basic lb should not have subnet name on the frontend ip configuration name", - subnetName: "shortsubnet", - isInternal: false, - useStandardLB: false, - expected: "a257b965551374ad2b091ef3f07043ad", + description: "external basic lb should not have subnet name on the frontend ip configuration name", + subnetName: "shortsubnet", + isInternal: false, + useStandardLB: false, + expected: "a257b965551374ad2b091ef3f07043ad", }, }