From f533e378ec15c796943ccafc3f1a7129169f64b8 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 6 Jun 2018 05:29:47 +0000 Subject: [PATCH] specify external resource group in ResizeDisk fix issue --- .../providers/azure/azure_managedDiskController.go | 10 ++++++++-- pkg/volume/azure_dd/azure_dd.go | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go index dc7e6e4e0d..62a47defcb 100644 --- a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go @@ -148,11 +148,17 @@ func (c *ManagedDiskController) getDisk(diskName string) (string, string, error) } // ResizeDisk Expand the disk to new size -func (c *ManagedDiskController) ResizeDisk(diskName string, oldSize resource.Quantity, newSize resource.Quantity) (resource.Quantity, error) { +func (c *ManagedDiskController) ResizeDisk(diskURI string, oldSize resource.Quantity, newSize resource.Quantity) (resource.Quantity, error) { ctx, cancel := getContextWithCancel() defer cancel() - result, err := c.common.cloud.DisksClient.Get(ctx, c.common.resourceGroup, diskName) + diskName := path.Base(diskURI) + resourceGroup, err := getResourceGroupFromDiskURI(diskURI) + if err != nil { + return oldSize, err + } + + result, err := c.common.cloud.DisksClient.Get(ctx, resourceGroup, diskName) if err != nil { return oldSize, err } diff --git a/pkg/volume/azure_dd/azure_dd.go b/pkg/volume/azure_dd/azure_dd.go index 91a572accb..91745c39fc 100644 --- a/pkg/volume/azure_dd/azure_dd.go +++ b/pkg/volume/azure_dd/azure_dd.go @@ -58,7 +58,7 @@ type DiskController interface { DeleteVolume(diskURI string) error // Expand the disk to new size - ResizeDisk(diskName string, oldSize resource.Quantity, newSize resource.Quantity) (resource.Quantity, error) + ResizeDisk(diskURI string, oldSize resource.Quantity, newSize resource.Quantity) (resource.Quantity, error) } type azureDataDiskPlugin struct { @@ -242,7 +242,7 @@ func (plugin *azureDataDiskPlugin) ExpandVolumeDevice( return oldSize, err } - return diskController.ResizeDisk(spec.PersistentVolume.Spec.AzureDisk.DiskName, oldSize, newSize) + return diskController.ResizeDisk(spec.PersistentVolume.Spec.AzureDisk.DataDiskURI, oldSize, newSize) } func (plugin *azureDataDiskPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) {