Commit 8c76a643 authored by Krunal Jain's avatar Krunal Jain

Fixing E2E tests for disk resizing

parent 3448701f
...@@ -773,11 +773,11 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity, ...@@ -773,11 +773,11 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity,
requestBytes := newSize.Value() requestBytes := newSize.Value()
// GCE resizes in chunks of GiBs // GCE resizes in chunks of GiBs
requestGB := volumeutil.RoundUpSize(requestBytes, volumeutil.GIB) requestGIB := volumeutil.RoundUpSize(requestBytes, volumeutil.GIB)
newSizeQuant := resource.MustParse(fmt.Sprintf("%dG", requestGB)) newSizeQuant := resource.MustParse(fmt.Sprintf("%dGi", requestGIB))
// If disk is already of size equal or greater than requested size, we simply return // If disk is already of size equal or greater than requested size, we simply return
if disk.SizeGb >= requestGB { if disk.SizeGb >= requestGIB {
return newSizeQuant, nil return newSizeQuant, nil
} }
...@@ -786,7 +786,7 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity, ...@@ -786,7 +786,7 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity,
switch zoneInfo := disk.ZoneInfo.(type) { switch zoneInfo := disk.ZoneInfo.(type) {
case singleZone: case singleZone:
mc = newDiskMetricContextZonal("resize", disk.Region, zoneInfo.zone) mc = newDiskMetricContextZonal("resize", disk.Region, zoneInfo.zone)
resizeOp, err := gce.manager.ResizeDiskOnCloudProvider(disk, requestGB, zoneInfo.zone) resizeOp, err := gce.manager.ResizeDiskOnCloudProvider(disk, requestGIB, zoneInfo.zone)
if err != nil { if err != nil {
return oldSize, mc.Observe(err) return oldSize, mc.Observe(err)
...@@ -799,7 +799,7 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity, ...@@ -799,7 +799,7 @@ func (gce *GCECloud) ResizeDisk(diskToResize string, oldSize resource.Quantity,
case multiZone: case multiZone:
if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) {
mc = newDiskMetricContextRegional("resize", disk.Region) mc = newDiskMetricContextRegional("resize", disk.Region)
resizeOp, err := gce.manager.RegionalResizeDiskOnCloudProvider(disk, requestGB) resizeOp, err := gce.manager.RegionalResizeDiskOnCloudProvider(disk, requestGIB)
if err != nil { if err != nil {
return oldSize, mc.Observe(err) return oldSize, mc.Observe(err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment