From ccdb09fddec374b74e68a8cff7617952bc41d272 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 27 Jun 2018 02:20:01 +0000 Subject: [PATCH] fix azure disk issue for external resource group --- .../providers/azure/azure_managedDiskController.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go index 4cb8aa2672d..ade2dbba548 100644 --- a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go @@ -84,7 +84,7 @@ func (c *ManagedDiskController) CreateManagedDisk(diskName string, storageAccoun diskID := "" err = kwait.ExponentialBackoff(defaultBackOff, func() (bool, error) { - provisionState, id, err := c.getDisk(diskName) + provisionState, id, err := c.getDisk(resourceGroup, diskName) diskID = id // We are waiting for provisioningState==Succeeded // We don't want to hand-off managed disks to k8s while they are @@ -131,11 +131,11 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error { } // return: disk provisionState, diskID, error -func (c *ManagedDiskController) getDisk(diskName string) (string, string, error) { +func (c *ManagedDiskController) getDisk(resourceGroup, diskName string) (string, string, error) { ctx, cancel := getContextWithCancel() defer cancel() - result, err := c.common.cloud.DisksClient.Get(ctx, c.common.resourceGroup, diskName) + result, err := c.common.cloud.DisksClient.Get(ctx, resourceGroup, diskName) if err != nil { return "", "", err } @@ -182,7 +182,7 @@ func (c *ManagedDiskController) ResizeDisk(diskURI string, oldSize resource.Quan ctx, cancel = getContextWithCancel() defer cancel() - if _, err := c.common.cloud.DisksClient.CreateOrUpdate(ctx, c.common.resourceGroup, diskName, result); err != nil { + if _, err := c.common.cloud.DisksClient.CreateOrUpdate(ctx, resourceGroup, diskName, result); err != nil { return oldSize, err }