Merge pull request kubernetes#3418 from nilo19/cleanup/enrich-containerservice-test

Add unit tests for azure aks node pool

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/azure/azure_client.go

@@ -23,14 +23,14 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2018-03-31/containerservice"
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
 	"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
 
 	klog "k8s.io/klog/v2"
+	"k8s.io/legacy-cloud-providers/azure/clients/containerserviceclient"
 	"k8s.io/legacy-cloud-providers/azure/clients/diskclient"
 	"k8s.io/legacy-cloud-providers/azure/clients/interfaceclient"
 	"k8s.io/legacy-cloud-providers/azure/clients/storageaccountclient"
@@ -147,7 +147,7 @@ type azClient struct {
 	interfacesClient                interfaceclient.Interface
 	disksClient                     diskclient.Interface
 	storageAccountsClient           storageaccountclient.Interface
-	managedContainerServicesClient  containerservice.ManagedClustersClient
+	managedKubernetesServicesClient containerserviceclient.Interface
 }
 
 // newServicePrincipalTokenFromCredentials creates a new ServicePrincipalToken using values of the
@@ -242,12 +242,9 @@ func newAzClient(cfg *Config, env *azure.Environment) (*azClient, error) {
 	disksClient := diskclient.New(diskClientConfig)
 	klog.V(5).Infof("Created disks client with authorizer: %v", disksClient)
 
-	managedContainerServicesClient := containerservice.NewManagedClustersClient(cfg.SubscriptionID)
-	managedContainerServicesClient.BaseURI = env.ResourceManagerEndpoint
-	managedContainerServicesClient.Authorizer = autorest.NewBearerAuthorizer(spt)
-	managedContainerServicesClient.PollingDelay = 5 * time.Second
-	managedContainerServicesClient.Sender = autorest.CreateSender()
-	klog.V(5).Infof("Created Managed Container services client with authorizer: %v", managedContainerServicesClient)
+	aksClientConfig := azClientConfig.WithRateLimiter(cfg.KubernetesServiceRateLimit)
+	kubernetesServicesClient := containerserviceclient.New(aksClientConfig)
+	klog.V(5).Infof("Created kubernetes services client with authorizer: %v", kubernetesServicesClient)
 
 	return &azClient{
 		disksClient:                     disksClient,
@@ -257,6 +254,6 @@ func newAzClient(cfg *Config, env *azure.Environment) (*azClient, error) {
 		deploymentsClient:               deploymentsClient,
 		virtualMachinesClient:           virtualMachinesClient,
 		storageAccountsClient:           storageAccountsClient,
-		managedContainerServicesClient:  managedContainerServicesClient,
+		managedKubernetesServicesClient: kubernetesServicesClient,
 	}, nil
 }

cluster-autoscaler/cloudprovider/azure/azure_cloud_provider_test.go

@@ -41,7 +41,7 @@ func newTestAzureManager(t *testing.T) *AzureManager {
 		env:                  azure.PublicCloud,
 		explicitlyConfigured: make(map[string]bool),
 		config: &Config{
-			ResourceGroup:       "test",
+			ResourceGroup:       "rg",
 			VMType:              vmTypeVMSS,
 			MaxDeploymentsCount: 2,
 			Deployment:          "deployment",
@@ -228,6 +228,13 @@ func TestBuildAzure(t *testing.T) {
 				CloudProviderRateLimitQPS:         1,
 				CloudProviderRateLimitQPSWrite:    1,
 			},
+			KubernetesServiceRateLimit: &azclients.RateLimitConfig{
+				CloudProviderRateLimit:            false,
+				CloudProviderRateLimitBucket:      5,
+				CloudProviderRateLimitBucketWrite: 5,
+				CloudProviderRateLimitQPS:         1,
+				CloudProviderRateLimitQPSWrite:    1,
+			},
 		},
 	}