From b3045389422493c943f6deaa1681b2f56fe0fe34 Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Tue, 3 Sep 2019 23:40:41 +0800 Subject: [PATCH] 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 --- hack/.staticcheck_failures | 1 - .../azure/azure_backoff.go | 3 + .../azure/azure_controller_common.go | 2 - .../azure/azure_instances_test.go | 4 +- .../azure/azure_loadbalancer_test.go | 1 - .../azure/azure_standard.go | 1 - .../azure/azure_test.go | 94 +++++++++---------- .../azure/azure_vmss_cache.go | 8 +- .../azure/azure_zones_test.go | 2 +- 9 files changed, 53 insertions(+), 63 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index a90443e253d..cb373c33a1b 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -178,5 +178,4 @@ vendor/k8s.io/kubectl/pkg/cmd/wait vendor/k8s.io/kubectl/pkg/describe/versioned vendor/k8s.io/kubectl/pkg/scale vendor/k8s.io/legacy-cloud-providers/aws -vendor/k8s.io/legacy-cloud-providers/azure vendor/k8s.io/metrics/pkg/client/custom_metrics diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go index a45905f7a30..3acbc944461 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go @@ -668,6 +668,9 @@ func (az *Cloud) CreateOrUpdateVmssWithRetry(resourceGroupName string, VMScaleSe // Since it is being deleted, we shouldn't send more CreateOrUpdate requests for it. klog.V(3).Infof("CreateOrUpdateVmssWithRetry: verify the status of the vmss being created or updated") vmss, err := az.VirtualMachineScaleSetsClient.Get(ctx, resourceGroupName, VMScaleSetName) + if err != nil { + klog.Warningf("CreateOrUpdateVmssWithRetry: error getting vmss: %s", err) + } if vmss.ProvisioningState != nil && strings.EqualFold(*vmss.ProvisioningState, virtualMachineScaleSetsDeallocating) { klog.V(3).Infof("CreateOrUpdateVmssWithRetry: found vmss %s being deleted, skipping", VMScaleSetName) return true, nil diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go index 7382e9c69ea..81b967b8a8a 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go @@ -36,8 +36,6 @@ import ( ) const ( - storageAccountNameTemplate = "pvc%s" - // for limits check https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits#storage-limits maxStorageAccounts = 100 // max # is 200 (250 with special request). this allows 100 for everything else including stand alone disks maxDisksPerStorageAccounts = 60 diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go index bf17e63473c..bd3d5eae27b 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go @@ -123,7 +123,7 @@ func TestInstanceID(t *testing.T) { mux := http.NewServeMux() mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, fmt.Sprintf(`{"compute":{"name":"%s","subscriptionId":"subscription","resourceGroupName":"rg"}}`, test.metadataName)) + fmt.Fprint(w, fmt.Sprintf(`{"compute":{"name":"%s","subscriptionId":"subscription","resourceGroupName":"rg"}}`, test.metadataName)) })) go func() { http.Serve(listener, mux) @@ -325,7 +325,7 @@ func TestNodeAddresses(t *testing.T) { mux := http.NewServeMux() mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, fmt.Sprintf(metadataTemplate, test.nodeName, test.ipV4, test.ipV4Public, test.ipV6, test.ipV6Public)) + fmt.Fprint(w, fmt.Sprintf(metadataTemplate, test.nodeName, test.ipV4, test.ipV4Public, test.ipV6, test.ipV6Public)) })) go func() { http.Serve(listener, mux) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go index 5a5bf4fe59b..7560410bf58 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go @@ -319,7 +319,6 @@ func TestSubnet(t *testing.T) { func TestEnsureLoadBalancerDeleted(t *testing.T) { const vmCount = 8 const availabilitySetCount = 4 - const serviceCount = 9 tests := []struct { desc string 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 22224db9c3a..216a2dc77ea 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 @@ -72,7 +72,6 @@ var errNotInVMSet = errors.New("vm is not in the vmset") var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(?:.*)/Microsoft.Compute/virtualMachines/(.+)$`) var backendPoolIDRE = regexp.MustCompile(`^/subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Network/loadBalancers/(.+)/backendAddressPools/(?:.*)`) var nicResourceGroupRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Network/networkInterfaces/(?:.*)`) -var publicIPResourceGroupRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Network/publicIPAddresses/(?:.*)`) // getStandardMachineID returns the full identifier of a virtual machine. func (az *Cloud) getStandardMachineID(subscriptionID, resourceGroup, machineName string) string { diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go index 9f54eb4f5e2..12026fe57b2 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go @@ -484,13 +484,13 @@ func TestReconcileSecurityGroupFromAnyDestinationAddressPrefixToLoadBalancerIP(t az := getTestCloud() svc1 := getTestService("serviceea", v1.ProtocolTCP, nil, 80) svc1.Spec.LoadBalancerIP = "192.168.0.0" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) // Simulate a pre-Kubernetes 1.8 NSG, where we do not specify the destination address prefix - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(""), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(""), true) if err != nil { t.Errorf("Unexpected error: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error: %q", err) } @@ -501,7 +501,7 @@ func TestReconcileSecurityGroupDynamicLoadBalancerIP(t *testing.T) { az := getTestCloud() svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80) svc1.Spec.LoadBalancerIP = "" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) dynamicallyAssignedIP := "192.168.0.0" sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(dynamicallyAssignedIP), true) if err != nil { @@ -603,12 +603,12 @@ func TestReconcileLoadBalancerRemoveService(t *testing.T) { clusterResources := getClusterResources(az, 1, 1) svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) - lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */) + _, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } - lb, err = az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, false /* wantLb */) + lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, false /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } @@ -653,13 +653,13 @@ func TestReconcileLoadBalancerRemovesPort(t *testing.T) { clusterResources := getClusterResources(az, 1, 1) svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) - lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */) + _, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80) - lb, err = az.reconcileLoadBalancer(testClusterName, &svcUpdated, clusterResources.nodes, true /* wantLb */) + lb, err := az.reconcileLoadBalancer(testClusterName, &svcUpdated, clusterResources.nodes, true /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } @@ -674,12 +674,12 @@ func TestReconcileLoadBalancerMultipleServices(t *testing.T) { svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) svc2 := getTestService("serviceb", v1.ProtocolTCP, nil, 80) - updatedLoadBalancer, err := az.reconcileLoadBalancer(testClusterName, &svc1, clusterResources.nodes, true /* wantLb */) + _, err := az.reconcileLoadBalancer(testClusterName, &svc1, clusterResources.nodes, true /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } - updatedLoadBalancer, err = az.reconcileLoadBalancer(testClusterName, &svc2, clusterResources.nodes, true /* wantLb */) + updatedLoadBalancer, err := az.reconcileLoadBalancer(testClusterName, &svc2, clusterResources.nodes, true /* wantLb */) if err != nil { t.Errorf("Unexpected error: %q", err) } @@ -822,7 +822,7 @@ func TestReconcileSecurityGroupRemoveServiceRemovesPort(t *testing.T) { svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) clusterResources := getClusterResources(az, 1, 1) - sg := getTestSecurityGroup(az, svc) + getTestSecurityGroup(az, svc) svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80) lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true) lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb) @@ -844,7 +844,7 @@ func TestReconcileSecurityWithSourceRanges(t *testing.T) { } clusterResources := getClusterResources(az, 1, 1) - sg := getTestSecurityGroup(az, svc) + getTestSecurityGroup(az, svc) lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true) lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb) @@ -1109,9 +1109,7 @@ func getClusterResources(az *Cloud, vmCount int, availabilitySetCount int) (clus vmCtx, vmCancel := getContextWithCancel() defer vmCancel() - _, err := az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "") - if err != nil { - } + az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "") // add to kubernetes newNode := &v1.Node{ ObjectMeta: metav1.ObjectMeta{ @@ -1809,7 +1807,7 @@ func TestIfServiceSpecifiesSharedRuleAndRuleDoesNotExistItIsCreated(t *testing.T svc.Spec.LoadBalancerIP = "192.168.77.88" svc.Annotations[ServiceAnnotationSharedSecurityRule] = "true" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) sg, err := az.reconcileSecurityGroup(testClusterName, &svc, to.StringPtr(svc.Spec.LoadBalancerIP), true) if err != nil { @@ -1908,14 +1906,14 @@ func TestIfServicesSpecifySharedRuleButDifferentPortsThenSeparateRulesAreCreated expectedRuleName1 := "shared-TCP-4444-Internet" expectedRuleName2 := "shared-TCP-8888-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } @@ -1977,14 +1975,14 @@ func TestIfServicesSpecifySharedRuleButDifferentProtocolsThenSeparateRulesAreCre expectedRuleName1 := "shared-TCP-4444-Internet" expectedRuleName2 := "shared-UDP-4444-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } @@ -2046,14 +2044,14 @@ func TestIfServicesSpecifySharedRuleButDifferentSourceAddressesThenSeparateRules expectedRuleName1 := "shared-TCP-80-192.168.12.0_24" expectedRuleName2 := "shared-TCP-80-192.168.34.0_24" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } @@ -2119,19 +2117,19 @@ func TestIfServicesSpecifySharedRuleButSomeAreOnDifferentPortsThenRulesAreSepara expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName2 := "shared-TCP-8888-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc3: %q", err) } @@ -2214,14 +2212,14 @@ func TestIfServiceSpecifiesSharedRuleAndServiceIsDeletedThenTheServicesPortAndAd expectedRuleName := "shared-TCP-80-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } @@ -2274,19 +2272,19 @@ func TestIfSomeServicesShareARuleAndOneIsDeletedItIsRemovedFromTheRightRule(t *t expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName2 := "shared-TCP-8888-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc3: %q", err) } @@ -2381,26 +2379,26 @@ func TestIfServiceSpecifiesSharedRuleAndLastServiceIsDeletedThenRuleIsDeleted(t expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName2 := "shared-TCP-8888-Internet" - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc3: %q", err) } validateSecurityGroup(t, sg, svc1, svc2, svc3) - sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false) + _, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false) if err != nil { t.Errorf("Unexpected error removing svc1: %q", err) } @@ -2471,29 +2469,29 @@ func TestCanCombineSharedAndPrivateRulesInSameGroup(t *testing.T) { expectedRuleName4 := az.getSecurityRuleName(&svc4, v1.ServicePort{Port: 4444, Protocol: v1.ProtocolTCP}, "Internet") expectedRuleName5 := az.getSecurityRuleName(&svc5, v1.ServicePort{Port: 8888, Protocol: v1.ProtocolTCP}, "Internet") - sg := getTestSecurityGroup(az) + getTestSecurityGroup(az) - sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) + _, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc1: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc2, to.StringPtr(svc2.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc2: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc3, to.StringPtr(svc3.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc3: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc4, to.StringPtr(svc4.Spec.LoadBalancerIP), true) + _, err = az.reconcileSecurityGroup(testClusterName, &svc4, to.StringPtr(svc4.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc4: %q", err) } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc5, to.StringPtr(svc5.Spec.LoadBalancerIP), true) + sg, err := az.reconcileSecurityGroup(testClusterName, &svc5, to.StringPtr(svc5.Spec.LoadBalancerIP), true) if err != nil { t.Errorf("Unexpected error adding svc4: %q", err) } @@ -2584,7 +2582,7 @@ func TestCanCombineSharedAndPrivateRulesInSameGroup(t *testing.T) { } } - sg, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false) + _, err = az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(svc1.Spec.LoadBalancerIP), false) if err != nil { t.Errorf("Unexpected error removing svc1: %q", err) } diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go index 614b16b93e6..dadfcf826bb 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go @@ -19,7 +19,6 @@ limitations under the License. package azure import ( - "fmt" "strings" "sync" "time" @@ -32,8 +31,7 @@ import ( ) var ( - vmssNameSeparator = "_" - vmssCacheSeparator = "#" + vmssNameSeparator = "_" vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey" availabilitySetNodesKey = "k8sAvailabilitySetNodesKey" @@ -50,10 +48,6 @@ type vmssVirtualMachinesEntry struct { lastUpdate time.Time } -func (ss *scaleSet) makeVmssVMName(scaleSetName, instanceID string) string { - return fmt.Sprintf("%s%s%s", scaleSetName, vmssNameSeparator, instanceID) -} - func extractVmssVMName(name string) (string, string, error) { split := strings.SplitAfter(name, vmssNameSeparator) if len(split) < 2 { diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go index 62dec7781e5..04ebda118b0 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go @@ -117,7 +117,7 @@ func TestGetZone(t *testing.T) { mux := http.NewServeMux() mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, fmt.Sprintf(`{"compute":{"zone":"%s", "platformFaultDomain":"%s", "location":"eastus"}}`, test.zone, test.faultDomain)) + fmt.Fprint(w, fmt.Sprintf(`{"compute":{"zone":"%s", "platformFaultDomain":"%s", "location":"eastus"}}`, test.zone, test.faultDomain)) })) go func() { http.Serve(listener, mux)