Skip to content

Commit b304538

Browse files
author
Guangming Wang
committed
fix staticcheck errors in legacy-cloud-providers/azure
clean remaining static check errors in legacy-cloud-providers/azure logging unhandled error in azure_backoff.go delete unused var and func in azure_vmss_cache.go run gofmt
1 parent bd77d5f commit b304538

File tree

9 files changed

+53
-63
lines changed

9 files changed

+53
-63
lines changed

‎hack/.staticcheck_failures‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,4 @@ vendor/k8s.io/kubectl/pkg/cmd/wait
178178
vendor/k8s.io/kubectl/pkg/describe/versioned
179179
vendor/k8s.io/kubectl/pkg/scale
180180
vendor/k8s.io/legacy-cloud-providers/aws
181-
vendor/k8s.io/legacy-cloud-providers/azure
182181
vendor/k8s.io/metrics/pkg/client/custom_metrics

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,9 @@ func (az *Cloud) CreateOrUpdateVmssWithRetry(resourceGroupName string, VMScaleSe
668668
// Since it is being deleted, we shouldn't send more CreateOrUpdate requests for it.
669669
klog.V(3).Infof("CreateOrUpdateVmssWithRetry: verify the status of the vmss being created or updated")
670670
vmss, err := az.VirtualMachineScaleSetsClient.Get(ctx, resourceGroupName, VMScaleSetName)
671+
if err != nil {
672+
klog.Warningf("CreateOrUpdateVmssWithRetry: error getting vmss: %s", err)
673+
}
671674
if vmss.ProvisioningState != nil && strings.EqualFold(*vmss.ProvisioningState, virtualMachineScaleSetsDeallocating) {
672675
klog.V(3).Infof("CreateOrUpdateVmssWithRetry: found vmss %s being deleted, skipping", VMScaleSetName)
673676
return true, nil

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import (
3636
)
3737

3838
const (
39-
storageAccountNameTemplate = "pvc%s"
40-
4139
// for limits check https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits#storage-limits
4240
maxStorageAccounts = 100 // max # is 200 (250 with special request). this allows 100 for everything else including stand alone disks
4341
maxDisksPerStorageAccounts = 60

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestInstanceID(t *testing.T) {
123123

124124
mux := http.NewServeMux()
125125
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
126-
fmt.Fprintf(w, fmt.Sprintf(`{"compute":{"name":"%s","subscriptionId":"subscription","resourceGroupName":"rg"}}`, test.metadataName))
126+
fmt.Fprint(w, fmt.Sprintf(`{"compute":{"name":"%s","subscriptionId":"subscription","resourceGroupName":"rg"}}`, test.metadataName))
127127
}))
128128
go func() {
129129
http.Serve(listener, mux)
@@ -325,7 +325,7 @@ func TestNodeAddresses(t *testing.T) {
325325

326326
mux := http.NewServeMux()
327327
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
328-
fmt.Fprintf(w, fmt.Sprintf(metadataTemplate, test.nodeName, test.ipV4, test.ipV4Public, test.ipV6, test.ipV6Public))
328+
fmt.Fprint(w, fmt.Sprintf(metadataTemplate, test.nodeName, test.ipV4, test.ipV4Public, test.ipV6, test.ipV6Public))
329329
}))
330330
go func() {
331331
http.Serve(listener, mux)

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ func TestSubnet(t *testing.T) {
319319
func TestEnsureLoadBalancerDeleted(t *testing.T) {
320320
const vmCount = 8
321321
const availabilitySetCount = 4
322-
const serviceCount = 9
323322

324323
tests := []struct {
325324
desc string

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ var errNotInVMSet = errors.New("vm is not in the vmset")
7272
var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(?:.*)/Microsoft.Compute/virtualMachines/(.+)$`)
7373
var backendPoolIDRE = regexp.MustCompile(`^/subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Network/loadBalancers/(.+)/backendAddressPools/(?:.*)`)
7474
var nicResourceGroupRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Network/networkInterfaces/(?:.*)`)
75-
var publicIPResourceGroupRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Network/publicIPAddresses/(?:.*)`)
7675

7776
// getStandardMachineID returns the full identifier of a virtual machine.
7877
func (az *Cloud) getStandardMachineID(subscriptionID, resourceGroup, machineName string) string {

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -484,13 +484,13 @@ func TestReconcileSecurityGroupFromAnyDestinationAddressPrefixToLoadBalancerIP(t
484484
az := getTestCloud()
485485
svc1 := getTestService("serviceea", v1.ProtocolTCP, nil, 80)
486486
svc1.Spec.LoadBalancerIP = "192.168.0.0"
487-
sg := getTestSecurityGroup(az)
487+
getTestSecurityGroup(az)
488488
// Simulate a pre-Kubernetes 1.8 NSG, where we do not specify the destination address prefix
489-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(""), true)
489+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(""), true)
490490
if err != nil {
491491
t.Errorf("Unexpected error: %q", err)
492492
}
493-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
493+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
494494
if err != nil {
495495
t.Errorf("Unexpected error: %q", err)
496496
}
@@ -501,7 +501,7 @@ func TestReconcileSecurityGroupDynamicLoadBalancerIP(t *testing.T) {
501501
az := getTestCloud()
502502
svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80)
503503
svc1.Spec.LoadBalancerIP = ""
504-
sg := getTestSecurityGroup(az)
504+
getTestSecurityGroup(az)
505505
dynamicallyAssignedIP := "192.168.0.0"
506506
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(dynamicallyAssignedIP), true)
507507
if err != nil {
@@ -603,12 +603,12 @@ func TestReconcileLoadBalancerRemoveService(t *testing.T) {
603603
clusterResources := getClusterResources(az, 1, 1)
604604
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
605605

606-
lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
606+
_, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
607607
if err != nil {
608608
t.Errorf("Unexpected error: %q", err)
609609
}
610610

611-
lb, err = az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, false /* wantLb */)
611+
lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, false /* wantLb */)
612612
if err != nil {
613613
t.Errorf("Unexpected error: %q", err)
614614
}
@@ -653,13 +653,13 @@ func TestReconcileLoadBalancerRemovesPort(t *testing.T) {
653653
clusterResources := getClusterResources(az, 1, 1)
654654

655655
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
656-
lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
656+
_, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
657657
if err != nil {
658658
t.Errorf("Unexpected error: %q", err)
659659
}
660660

661661
svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80)
662-
lb, err = az.reconcileLoadBalancer(testClusterName, &svcUpdated, clusterResources.nodes, true /* wantLb */)
662+
lb, err := az.reconcileLoadBalancer(testClusterName, &svcUpdated, clusterResources.nodes, true /* wantLb */)
663663
if err != nil {
664664
t.Errorf("Unexpected error: %q", err)
665665
}
@@ -674,12 +674,12 @@ func TestReconcileLoadBalancerMultipleServices(t *testing.T) {
674674
svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
675675
svc2 := getTestService("serviceb", v1.ProtocolTCP, nil, 80)
676676

677-
updatedLoadBalancer, err := az.reconcileLoadBalancer(testClusterName, &svc1, clusterResources.nodes, true /* wantLb */)
677+
_, err := az.reconcileLoadBalancer(testClusterName, &svc1, clusterResources.nodes, true /* wantLb */)
678678
if err != nil {
679679
t.Errorf("Unexpected error: %q", err)
680680
}
681681

682-
updatedLoadBalancer, err = az.reconcileLoadBalancer(testClusterName, &svc2, clusterResources.nodes, true /* wantLb */)
682+
updatedLoadBalancer, err := az.reconcileLoadBalancer(testClusterName, &svc2, clusterResources.nodes, true /* wantLb */)
683683
if err != nil {
684684
t.Errorf("Unexpected error: %q", err)
685685
}
@@ -822,7 +822,7 @@ func TestReconcileSecurityGroupRemoveServiceRemovesPort(t *testing.T) {
822822
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
823823
clusterResources := getClusterResources(az, 1, 1)
824824

825-
sg := getTestSecurityGroup(az, svc)
825+
getTestSecurityGroup(az, svc)
826826
svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80)
827827
lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true)
828828
lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb)
@@ -844,7 +844,7 @@ func TestReconcileSecurityWithSourceRanges(t *testing.T) {
844844
}
845845
clusterResources := getClusterResources(az, 1, 1)
846846

847-
sg := getTestSecurityGroup(az, svc)
847+
getTestSecurityGroup(az, svc)
848848
lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true)
849849
lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb)
850850

@@ -1109,9 +1109,7 @@ func getClusterResources(az *Cloud, vmCount int, availabilitySetCount int) (clus
11091109

11101110
vmCtx, vmCancel := getContextWithCancel()
11111111
defer vmCancel()
1112-
_, err := az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "")
1113-
if err != nil {
1114-
}
1112+
az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "")
11151113
// add to kubernetes
11161114
newNode := &v1.Node{
11171115
ObjectMeta: metav1.ObjectMeta{
@@ -1809,7 +1807,7 @@ func TestIfServiceSpecifiesSharedRuleAndRuleDoesNotExistItIsCreated(t *testing.T
18091807
svc.Spec.LoadBalancerIP = "192.168.77.88"
18101808
svc.Annotations[ServiceAnnotationSharedSecurityRule] = "true"
18111809

1812-
sg := getTestSecurityGroup(az)
1810+
getTestSecurityGroup(az)
18131811

18141812
sg, err := az.reconcileSecurityGroup(testClusterName, &svc, to.StringPtr(svc.Spec.LoadBalancerIP), true)
18151813
if err != nil {
@@ -1908,14 +1906,14 @@ func TestIfServicesSpecifySharedRuleButDifferentPortsThenSeparateRulesAreCreated
19081906
expectedRuleName1 := "shared-TCP-4444-Internet"
19091907
expectedRuleName2 := "shared-TCP-8888-Internet"
19101908

1911-
sg := getTestSecurityGroup(az)
1909+
getTestSecurityGroup(az)
19121910

1913-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
1911+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
19141912
if err != nil {
19151913
t.Errorf("Unexpected error adding svc1: %q", err)
19161914
}
19171915

1918-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
1916+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
19191917
if err != nil {
19201918
t.Errorf("Unexpected error adding svc2: %q", err)
19211919
}
@@ -1977,14 +1975,14 @@ func TestIfServicesSpecifySharedRuleButDifferentProtocolsThenSeparateRulesAreCre
19771975
expectedRuleName1 := "shared-TCP-4444-Internet"
19781976
expectedRuleName2 := "shared-UDP-4444-Internet"
19791977

1980-
sg := getTestSecurityGroup(az)
1978+
getTestSecurityGroup(az)
19811979

1982-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
1980+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
19831981
if err != nil {
19841982
t.Errorf("Unexpected error adding svc1: %q", err)
19851983
}
19861984

1987-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
1985+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
19881986
if err != nil {
19891987
t.Errorf("Unexpected error adding svc2: %q", err)
19901988
}
@@ -2046,14 +2044,14 @@ func TestIfServicesSpecifySharedRuleButDifferentSourceAddressesThenSeparateRules
20462044
expectedRuleName1 := "shared-TCP-80-192.168.12.0_24"
20472045
expectedRuleName2 := "shared-TCP-80-192.168.34.0_24"
20482046

2049-
sg := getTestSecurityGroup(az)
2047+
getTestSecurityGroup(az)
20502048

2051-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2049+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
20522050
if err != nil {
20532051
t.Errorf("Unexpected error adding svc1: %q", err)
20542052
}
20552053

2056-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2054+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
20572055
if err != nil {
20582056
t.Errorf("Unexpected error adding svc2: %q", err)
20592057
}
@@ -2119,19 +2117,19 @@ func TestIfServicesSpecifySharedRuleButSomeAreOnDifferentPortsThenRulesAreSepara
21192117
expectedRuleName13 := "shared-TCP-4444-Internet"
21202118
expectedRuleName2 := "shared-TCP-8888-Internet"
21212119

2122-
sg := getTestSecurityGroup(az)
2120+
getTestSecurityGroup(az)
21232121

2124-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2122+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
21252123
if err != nil {
21262124
t.Errorf("Unexpected error adding svc1: %q", err)
21272125
}
21282126

2129-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2127+
_, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
21302128
if err != nil {
21312129
t.Errorf("Unexpected error adding svc2: %q", err)
21322130
}
21332131

2134-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
2132+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
21352133
if err != nil {
21362134
t.Errorf("Unexpected error adding svc3: %q", err)
21372135
}
@@ -2214,14 +2212,14 @@ func TestIfServiceSpecifiesSharedRuleAndServiceIsDeletedThenTheServicesPortAndAd
22142212

22152213
expectedRuleName := "shared-TCP-80-Internet"
22162214

2217-
sg := getTestSecurityGroup(az)
2215+
getTestSecurityGroup(az)
22182216

2219-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2217+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
22202218
if err != nil {
22212219
t.Errorf("Unexpected error adding svc1: %q", err)
22222220
}
22232221

2224-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2222+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
22252223
if err != nil {
22262224
t.Errorf("Unexpected error adding svc2: %q", err)
22272225
}
@@ -2274,19 +2272,19 @@ func TestIfSomeServicesShareARuleAndOneIsDeletedItIsRemovedFromTheRightRule(t *t
22742272
expectedRuleName13 := "shared-TCP-4444-Internet"
22752273
expectedRuleName2 := "shared-TCP-8888-Internet"
22762274

2277-
sg := getTestSecurityGroup(az)
2275+
getTestSecurityGroup(az)
22782276

2279-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2277+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
22802278
if err != nil {
22812279
t.Errorf("Unexpected error adding svc1: %q", err)
22822280
}
22832281

2284-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2282+
_, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
22852283
if err != nil {
22862284
t.Errorf("Unexpected error adding svc2: %q", err)
22872285
}
22882286

2289-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
2287+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
22902288
if err != nil {
22912289
t.Errorf("Unexpected error adding svc3: %q", err)
22922290
}
@@ -2381,26 +2379,26 @@ func TestIfServiceSpecifiesSharedRuleAndLastServiceIsDeletedThenRuleIsDeleted(t
23812379
expectedRuleName13 := "shared-TCP-4444-Internet"
23822380
expectedRuleName2 := "shared-TCP-8888-Internet"
23832381

2384-
sg := getTestSecurityGroup(az)
2382+
getTestSecurityGroup(az)
23852383

2386-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2384+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
23872385
if err != nil {
23882386
t.Errorf("Unexpected error adding svc1: %q", err)
23892387
}
23902388

2391-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2389+
_, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
23922390
if err != nil {
23932391
t.Errorf("Unexpected error adding svc2: %q", err)
23942392
}
23952393

2396-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
2394+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
23972395
if err != nil {
23982396
t.Errorf("Unexpected error adding svc3: %q", err)
23992397
}
24002398

24012399
validateSecurityGroup(t, sg, svc1, svc2, svc3)
24022400

2403-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false)
2401+
_, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false)
24042402
if err != nil {
24052403
t.Errorf("Unexpected error removing svc1: %q", err)
24062404
}
@@ -2471,29 +2469,29 @@ func TestCanCombineSharedAndPrivateRulesInSameGroup(t *testing.T) {
24712469
expectedRuleName4 := az.getSecurityRuleName(&svc4, v1.ServicePort{Port: 4444, Protocol: v1.ProtocolTCP}, "Internet")
24722470
expectedRuleName5 := az.getSecurityRuleName(&svc5, v1.ServicePort{Port: 8888, Protocol: v1.ProtocolTCP}, "Internet")
24732471

2474-
sg := getTestSecurityGroup(az)
2472+
getTestSecurityGroup(az)
24752473

2476-
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
2474+
_, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true)
24772475
if err != nil {
24782476
t.Errorf("Unexpected error adding svc1: %q", err)
24792477
}
24802478

2481-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
2479+
_, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true)
24822480
if err != nil {
24832481
t.Errorf("Unexpected error adding svc2: %q", err)
24842482
}
24852483

2486-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
2484+
_, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true)
24872485
if err != nil {
24882486
t.Errorf("Unexpected error adding svc3: %q", err)
24892487
}
24902488

2491-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc4, to.StringPtr(svc4.Spec.LoadBalancerIP), true)
2489+
_, err = az.reconcileSecurityGroup(testClusterName, &svc4, to.StringPtr(svc4.Spec.LoadBalancerIP), true)
24922490
if err != nil {
24932491
t.Errorf("Unexpected error adding svc4: %q", err)
24942492
}
24952493

2496-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc5, to.StringPtr(svc5.Spec.LoadBalancerIP), true)
2494+
sg, err := az.reconcileSecurityGroup(testClusterName, &svc5, to.StringPtr(svc5.Spec.LoadBalancerIP), true)
24972495
if err != nil {
24982496
t.Errorf("Unexpected error adding svc4: %q", err)
24992497
}
@@ -2584,7 +2582,7 @@ func TestCanCombineSharedAndPrivateRulesInSameGroup(t *testing.T) {
25842582
}
25852583
}
25862584

2587-
sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false)
2585+
_, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false)
25882586
if err != nil {
25892587
t.Errorf("Unexpected error removing svc1: %q", err)
25902588
}

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ limitations under the License.
1919
package azure
2020

2121
import (
22-
"fmt"
2322
"strings"
2423
"sync"
2524
"time"
@@ -32,8 +31,7 @@ import (
3231
)
3332

3433
var (
35-
vmssNameSeparator = "_"
36-
vmssCacheSeparator = "#"
34+
vmssNameSeparator = "_"
3735

3836
vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey"
3937
availabilitySetNodesKey = "k8sAvailabilitySetNodesKey"
@@ -50,10 +48,6 @@ type vmssVirtualMachinesEntry struct {
5048
lastUpdate time.Time
5149
}
5250

53-
func (ss *scaleSet) makeVmssVMName(scaleSetName, instanceID string) string {
54-
return fmt.Sprintf("%s%s%s", scaleSetName, vmssNameSeparator, instanceID)
55-
}
56-
5751
func extractVmssVMName(name string) (string, string, error) {
5852
split := strings.SplitAfter(name, vmssNameSeparator)
5953
if len(split) < 2 {

0 commit comments

Comments
 (0)