Skip to content

Commit ea51fba

Browse files
committed
fix: azure disk resize error if source does not exist
fix gofmt
1 parent c7760ac commit ea51fba

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,15 @@ func (c *ManagedDiskController) ResizeDisk(diskURI string, oldSize resource.Quan
297297
return newSizeQuant, nil
298298
}
299299

300-
result.DiskProperties.DiskSizeGB = &requestGiB
300+
diskParameter := compute.DiskUpdate{
301+
DiskUpdateProperties: &compute.DiskUpdateProperties{
302+
DiskSizeGB: &requestGiB,
303+
},
304+
}
301305

302306
ctx, cancel = getContextWithCancel()
303307
defer cancel()
304-
if rerr := c.common.cloud.DisksClient.CreateOrUpdate(ctx, resourceGroup, diskName, result); rerr != nil {
308+
if rerr := c.common.cloud.DisksClient.Update(ctx, resourceGroup, diskName, diskParameter); rerr != nil {
305309
return oldSize, rerr.Error()
306310
}
307311

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,9 @@ func TestResizeDisk(t *testing.T) {
369369
mockDisksClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, test.diskName).Return(test.existedDisk, nil).AnyTimes()
370370
}
371371
if test.diskName == fakeCreateDiskFailed {
372-
mockDisksClient.EXPECT().CreateOrUpdate(gomock.Any(), testCloud.ResourceGroup, test.diskName, gomock.Any()).Return(&retry.Error{RawError: fmt.Errorf("Create Disk failed")}).AnyTimes()
372+
mockDisksClient.EXPECT().Update(gomock.Any(), testCloud.ResourceGroup, test.diskName, gomock.Any()).Return(&retry.Error{RawError: fmt.Errorf("Create Disk failed")}).AnyTimes()
373373
} else {
374-
mockDisksClient.EXPECT().CreateOrUpdate(gomock.Any(), testCloud.ResourceGroup, test.diskName, gomock.Any()).Return(nil).AnyTimes()
374+
mockDisksClient.EXPECT().Update(gomock.Any(), testCloud.ResourceGroup, test.diskName, gomock.Any()).Return(nil).AnyTimes()
375375
}
376376

377377
result, err := managedDiskController.ResizeDisk(diskURI, test.oldSize, test.newSize)

0 commit comments

Comments
 (0)