Merge pull request kubernetes#87555 from feiskyer/client-cleanup

Cleanup unused Azure client interfaces

Author: k8s-ci-robot

staging/src/k8s.io/legacy-cloud-providers/azure/BUILD

@@ -13,7 +13,6 @@ go_library(
         "azure_backoff.go",
         "azure_blobDiskController.go",
         "azure_cache.go",
-        "azure_client.go",
         "azure_config.go",
         "azure_controller_common.go",
         "azure_controller_standard.go",

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

@@ -227,21 +227,21 @@ type Cloud struct {
 	Config
 	Environment azure.Environment
 
-	RoutesClient                    RoutesClient
-	SubnetsClient                   SubnetsClient
-	InterfacesClient                InterfacesClient
-	RouteTablesClient               RouteTablesClient
-	LoadBalancerClient              LoadBalancersClient
-	PublicIPAddressesClient         PublicIPAddressesClient
-	SecurityGroupsClient            SecurityGroupsClient
-	VirtualMachinesClient           VirtualMachinesClient
-	StorageAccountClient            StorageAccountClient
-	DisksClient                     DisksClient
-	SnapshotsClient                 SnapshotsClient
+	RoutesClient                    routeclient.Interface
+	SubnetsClient                   subnetclient.Interface
+	InterfacesClient                interfaceclient.Interface
+	RouteTablesClient               routetableclient.Interface
+	LoadBalancerClient              loadbalancerclient.Interface
+	PublicIPAddressesClient         publicipclient.Interface
+	SecurityGroupsClient            securitygroupclient.Interface
+	VirtualMachinesClient           vmclient.Interface
+	StorageAccountClient            storageaccountclient.Interface
+	DisksClient                     diskclient.Interface
+	SnapshotsClient                 snapshotclient.Interface
 	FileClient                      FileClient
-	VirtualMachineScaleSetsClient   VirtualMachineScaleSetsClient
-	VirtualMachineScaleSetVMsClient VirtualMachineScaleSetVMsClient
-	VirtualMachineSizesClient       VirtualMachineSizesClient
+	VirtualMachineScaleSetsClient   vmssclient.Interface
+	VirtualMachineScaleSetVMsClient vmssvmclient.Interface
+	VirtualMachineSizesClient       vmsizeclient.Interface
 
 	ResourceRequestBackoff wait.Backoff
 	metadata               *InstanceMetadataService

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

@@ -19,6 +19,7 @@ limitations under the License.
 package azure
 
 import (
+	"context"
 	"sync"
 )
 
@@ -69,3 +70,7 @@ func (lm *lockMap) lockEntry(entry string) {
 func (lm *lockMap) unlockEntry(entry string) {
 	lm.mutexMap[entry].Unlock()
 }
+
+func getContextWithCancel() (context.Context, context.CancelFunc) {
+	return context.WithCancel(context.Background())
+}

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

@@ -40,6 +40,9 @@ import (
 )
 
 var (
+	// virtualMachineScaleSetsDeallocating indicates VMSS instances are in Deallocating state.
+	virtualMachineScaleSetsDeallocating = "Deallocating"
+
 	// ErrorNotVmssInstance indicates an instance is not belongint to any vmss.
 	ErrorNotVmssInstance = errors.New("not a vmss instance")