github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82315 from beautytiger/fix_staticcheck_azure

Browse Source 
fix staticcheck errors in legacy-cloud-providers/azure
This commit is contained in:
Kubernetes Prow Robot 2019-12-05 06:36:32 -08:00 committed by GitHub
commit 8290c85b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -174,5 +174,4 @@ vendor/k8s.io/kubectl/pkg/cmd/wait
vendor/k8s.io/kubectl/pkg/describe/versioned vendor/k8s.io/kubectl/pkg/describe/versioned
vendor/k8s.io/kubectl/pkg/scale vendor/k8s.io/kubectl/pkg/scale
vendor/k8s.io/legacy-cloud-providers/aws vendor/k8s.io/legacy-cloud-providers/aws
vendor/k8s.io/legacy-cloud-providers/azure
vendor/k8s.io/metrics/pkg/client/custom_metrics vendor/k8s.io/metrics/pkg/client/custom_metrics

3
staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go
View File

@ -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. // 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") klog.V(3).Infof("CreateOrUpdateVmssWithRetry: verify the status of the vmss being created or updated")
vmss, err := az.VirtualMachineScaleSetsClient.Get(ctx, resourceGroupName, VMScaleSetName) 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) { if vmss.ProvisioningState != nil && strings.EqualFold(*vmss.ProvisioningState, virtualMachineScaleSetsDeallocating) {
klog.V(3).Infof("CreateOrUpdateVmssWithRetry: found vmss %s being deleted, skipping", VMScaleSetName) klog.V(3).Infof("CreateOrUpdateVmssWithRetry: found vmss %s being deleted, skipping", VMScaleSetName)
return true, nil return true, nil

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go
View File

@ -36,8 +36,6 @@ import (
) )
const ( const (
storageAccountNameTemplate = "pvc%s"
// for limits check https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits#storage-limits // 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 maxStorageAccounts = 100 // max # is 200 (250 with special request). this allows 100 for everything else including stand alone disks
maxDisksPerStorageAccounts = 60 maxDisksPerStorageAccounts = 60

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go
View File

@ -123,7 +123,7 @@ func TestInstanceID(t *testing.T) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 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() { go func() {
http.Serve(listener, mux) http.Serve(listener, mux)
@ -325,7 +325,7 @@ func TestNodeAddresses(t *testing.T) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 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() { go func() {
http.Serve(listener, mux) http.Serve(listener, mux)

1
staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go
View File

@ -319,7 +319,6 @@ func TestSubnet(t *testing.T) {
func TestEnsureLoadBalancerDeleted(t *testing.T) { func TestEnsureLoadBalancerDeleted(t *testing.T) {
const vmCount = 8 const vmCount = 8
const availabilitySetCount = 4 const availabilitySetCount = 4
const serviceCount = 9
tests := []struct { tests := []struct {
desc string desc string

1
staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go
View File

@ -72,7 +72,6 @@ var errNotInVMSet = errors.New("vm is not in the vmset")
var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(?:.*)/Microsoft.Compute/virtualMachines/(.+)$`) var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(?:.*)/Microsoft.Compute/virtualMachines/(.+)$`)
var backendPoolIDRE = regexp.MustCompile(`^/subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Network/loadBalancers/(.+)/backendAddressPools/(?:.*)`) var backendPoolIDRE = regexp.MustCompile(`^/subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Network/loadBalancers/(.+)/backendAddressPools/(?:.*)`)
var nicResourceGroupRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Network/networkInterfaces/(?:.*)`) 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. // getStandardMachineID returns the full identifier of a virtual machine.
func (az *Cloud) getStandardMachineID(subscriptionID, resourceGroup, machineName string) string { func (az *Cloud) getStandardMachineID(subscriptionID, resourceGroup, machineName string) string {

94
staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go
View File

@ -484,13 +484,13 @@ func TestReconcileSecurityGroupFromAnyDestinationAddressPrefixToLoadBalancerIP(t
az := getTestCloud() az := getTestCloud()
svc1 := getTestService("serviceea", v1.ProtocolTCP, nil, 80) svc1 := getTestService("serviceea", v1.ProtocolTCP, nil, 80)
svc1.Spec.LoadBalancerIP = "192.168.0.0" 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 // 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) t.Errorf("Unexpected error: %q", err)
} }
@ -501,7 +501,7 @@ func TestReconcileSecurityGroupDynamicLoadBalancerIP(t *testing.T) {
az := getTestCloud() az := getTestCloud()
svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80) svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80)
svc1.Spec.LoadBalancerIP = "" svc1.Spec.LoadBalancerIP = ""
sg := getTestSecurityGroup(az) getTestSecurityGroup(az)
dynamicallyAssignedIP := "192.168.0.0" dynamicallyAssignedIP := "192.168.0.0"
sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(dynamicallyAssignedIP), true) sg, err := az.reconcileSecurityGroup(testClusterName, &svc1, to.StringPtr(dynamicallyAssignedIP), true)
if err != nil { if err != nil {
@ -603,12 +603,12 @@ func TestReconcileLoadBalancerRemoveService(t *testing.T) {
clusterResources := getClusterResources(az, 1, 1) clusterResources := getClusterResources(az, 1, 1)
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) t.Errorf("Unexpected error: %q", err)
} }
@ -653,13 +653,13 @@ func TestReconcileLoadBalancerRemovesPort(t *testing.T) {
clusterResources := getClusterResources(az, 1, 1) clusterResources := getClusterResources(az, 1, 1)
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) t.Errorf("Unexpected error: %q", err)
} }
svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) t.Errorf("Unexpected error: %q", err)
} }
@ -674,12 +674,12 @@ func TestReconcileLoadBalancerMultipleServices(t *testing.T) {
svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) svc1 := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
svc2 := getTestService("serviceb", v1.ProtocolTCP, nil, 80) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error: %q", err) t.Errorf("Unexpected error: %q", err)
} }
@ -822,7 +822,7 @@ func TestReconcileSecurityGroupRemoveServiceRemovesPort(t *testing.T) {
svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443) svc := getTestService("servicea", v1.ProtocolTCP, nil, 80, 443)
clusterResources := getClusterResources(az, 1, 1) clusterResources := getClusterResources(az, 1, 1)
sg := getTestSecurityGroup(az, svc) getTestSecurityGroup(az, svc)
svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80) svcUpdated := getTestService("servicea", v1.ProtocolTCP, nil, 80)
lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true) lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true)
lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb) lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb)
@ -844,7 +844,7 @@ func TestReconcileSecurityWithSourceRanges(t *testing.T) {
} }
clusterResources := getClusterResources(az, 1, 1) clusterResources := getClusterResources(az, 1, 1)
sg := getTestSecurityGroup(az, svc) getTestSecurityGroup(az, svc)
lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true) lb, _ := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true)
lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb) lbStatus, _ := az.getServiceLoadBalancerStatus(&svc, lb)
@ -1109,9 +1109,7 @@ func getClusterResources(az *Cloud, vmCount int, availabilitySetCount int) (clus
vmCtx, vmCancel := getContextWithCancel() vmCtx, vmCancel := getContextWithCancel()
defer vmCancel() defer vmCancel()
_, err := az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "") az.VirtualMachinesClient.CreateOrUpdate(vmCtx, az.Config.ResourceGroup, vmName, newVM, "")
if err != nil {
}
// add to kubernetes // add to kubernetes
newNode := &v1.Node{ newNode := &v1.Node{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -1809,7 +1807,7 @@ func TestIfServiceSpecifiesSharedRuleAndRuleDoesNotExistItIsCreated(t *testing.T
svc.Spec.LoadBalancerIP = "192.168.77.88" svc.Spec.LoadBalancerIP = "192.168.77.88"
svc.Annotations[ServiceAnnotationSharedSecurityRule] = "true" svc.Annotations[ServiceAnnotationSharedSecurityRule] = "true"
sg := getTestSecurityGroup(az) getTestSecurityGroup(az)
sg, err := az.reconcileSecurityGroup(testClusterName, &svc, to.StringPtr(svc.Spec.LoadBalancerIP), true) sg, err := az.reconcileSecurityGroup(testClusterName, &svc, to.StringPtr(svc.Spec.LoadBalancerIP), true)
if err != nil { if err != nil {
@ -1908,14 +1906,14 @@ func TestIfServicesSpecifySharedRuleButDifferentPortsThenSeparateRulesAreCreated
expectedRuleName1 := "shared-TCP-4444-Internet" expectedRuleName1 := "shared-TCP-4444-Internet"
expectedRuleName2 := "shared-TCP-8888-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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) t.Errorf("Unexpected error adding svc2: %q", err)
} }
@ -1977,14 +1975,14 @@ func TestIfServicesSpecifySharedRuleButDifferentProtocolsThenSeparateRulesAreCre
expectedRuleName1 := "shared-TCP-4444-Internet" expectedRuleName1 := "shared-TCP-4444-Internet"
expectedRuleName2 := "shared-UDP-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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) t.Errorf("Unexpected error adding svc2: %q", err)
} }
@ -2046,14 +2044,14 @@ func TestIfServicesSpecifySharedRuleButDifferentSourceAddressesThenSeparateRules
expectedRuleName1 := "shared-TCP-80-192.168.12.0_24" expectedRuleName1 := "shared-TCP-80-192.168.12.0_24"
expectedRuleName2 := "shared-TCP-80-192.168.34.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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) t.Errorf("Unexpected error adding svc2: %q", err)
} }
@ -2119,19 +2117,19 @@ func TestIfServicesSpecifySharedRuleButSomeAreOnDifferentPortsThenRulesAreSepara
expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName13 := "shared-TCP-4444-Internet"
expectedRuleName2 := "shared-TCP-8888-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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc3: %q", err) t.Errorf("Unexpected error adding svc3: %q", err)
} }
@ -2214,14 +2212,14 @@ func TestIfServiceSpecifiesSharedRuleAndServiceIsDeletedThenTheServicesPortAndAd
expectedRuleName := "shared-TCP-80-Internet" 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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) t.Errorf("Unexpected error adding svc2: %q", err)
} }
@ -2274,19 +2272,19 @@ func TestIfSomeServicesShareARuleAndOneIsDeletedItIsRemovedFromTheRightRule(t *t
expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName13 := "shared-TCP-4444-Internet"
expectedRuleName2 := "shared-TCP-8888-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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc3: %q", err) t.Errorf("Unexpected error adding svc3: %q", err)
} }
@ -2381,26 +2379,26 @@ func TestIfServiceSpecifiesSharedRuleAndLastServiceIsDeletedThenRuleIsDeleted(t
expectedRuleName13 := "shared-TCP-4444-Internet" expectedRuleName13 := "shared-TCP-4444-Internet"
expectedRuleName2 := "shared-TCP-8888-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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc3: %q", err) t.Errorf("Unexpected error adding svc3: %q", err)
} }
validateSecurityGroup(t, sg, svc1, svc2, svc3) 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 { if err != nil {
t.Errorf("Unexpected error removing svc1: %q", err) 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") expectedRuleName4 := az.getSecurityRuleName(&svc4, v1.ServicePort{Port: 4444, Protocol: v1.ProtocolTCP}, "Internet")
expectedRuleName5 := az.getSecurityRuleName(&svc5, v1.ServicePort{Port: 8888, 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 { if err != nil {
t.Errorf("Unexpected error adding svc1: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc2: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc3: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc4: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error adding svc4: %q", err) 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 { if err != nil {
t.Errorf("Unexpected error removing svc1: %q", err) t.Errorf("Unexpected error removing svc1: %q", err)
} }

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go
View File

@ -19,7 +19,6 @@ limitations under the License.
package azure package azure
import ( import (
"fmt"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -32,8 +31,7 @@ import (
) )
var ( var (
vmssNameSeparator = "_" vmssNameSeparator = "_"
vmssCacheSeparator = "#"
vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey" vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey"
availabilitySetNodesKey = "k8sAvailabilitySetNodesKey" availabilitySetNodesKey = "k8sAvailabilitySetNodesKey"
@ -50,10 +48,6 @@ type vmssVirtualMachinesEntry struct {
lastUpdate time.Time 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) { func extractVmssVMName(name string) (string, string, error) {
split := strings.SplitAfter(name, vmssNameSeparator) split := strings.SplitAfter(name, vmssNameSeparator)
if len(split) < 2 { if len(split) < 2 {

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go
View File

@ -117,7 +117,7 @@ func TestGetZone(t *testing.T) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 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() { go func() {
http.Serve(listener, mux) http.Serve(listener, mux)