@@ -28,7 +28,7 @@ import (
2828 "google.golang.org/grpc/codes"
2929 "google.golang.org/grpc/status"
3030 "k8s.io/apimachinery/pkg/util/wait"
31- "k8s.io/klog"
31+ "k8s.io/klog/v2 "
3232 "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
3333)
3434
@@ -115,7 +115,7 @@ func (cloud *CloudProvider) GetDefaultZone() string {
115115func (cloud * CloudProvider ) ListDisks (ctx context.Context ) ([]* computev1.Disk , string , error ) {
116116 region , err := common .GetRegionFromZones ([]string {cloud .zone })
117117 if err != nil {
118- return nil , "" , fmt .Errorf ("failed to get region from zones: %v " , err )
118+ return nil , "" , fmt .Errorf ("failed to get region from zones: %w " , err )
119119 }
120120 zones , err := cloud .ListZones (ctx , region )
121121 if err != nil {
@@ -162,7 +162,7 @@ func (cloud *CloudProvider) RepairUnderspecifiedVolumeKey(ctx context.Context, p
162162 }
163163 region , err := common .GetRegionFromZones ([]string {cloud .zone })
164164 if err != nil {
165- return "" , nil , fmt .Errorf ("failed to get region from zones: %v " , err )
165+ return "" , nil , fmt .Errorf ("failed to get region from zones: %w " , err )
166166 }
167167 switch volumeKey .Type () {
168168 case meta .Zonal :
@@ -216,7 +216,7 @@ func (cloud *CloudProvider) ListZones(ctx context.Context, region string) ([]str
216216 zones := []string {}
217217 zoneList , err := cloud .service .Zones .List (cloud .project ).Filter (fmt .Sprintf ("region eq .*%s$" , region )).Do ()
218218 if err != nil {
219- return nil , fmt .Errorf ("failed to list zones in region %s: %v " , region , err )
219+ return nil , fmt .Errorf ("failed to list zones in region %s: %w " , region , err )
220220 }
221221 for _ , zone := range zoneList .Items {
222222 zones = append (zones , zone .Name )
@@ -493,7 +493,7 @@ func (cloud *CloudProvider) insertRegionalDisk(
493493 klog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
494494 return nil
495495 }
496- return status .Error (codes .Internal , fmt .Sprintf ("unknown Insert disk error: %v" , err ))
496+ return status .Error (codes .Internal , fmt .Sprintf ("unknown Insert disk error: %v" , err . Error () ))
497497 }
498498 klog .V (5 ).Infof ("InsertDisk operation %s for disk %s" , opName , diskToCreate .Name )
499499
@@ -514,7 +514,7 @@ func (cloud *CloudProvider) insertRegionalDisk(
514514 klog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
515515 return nil
516516 }
517- return fmt .Errorf ("unknown Insert disk operation error: %v " , err )
517+ return fmt .Errorf ("unknown Insert disk operation error: %w " , err )
518518 }
519519 return nil
520520}
@@ -604,7 +604,7 @@ func (cloud *CloudProvider) insertZonalDisk(
604604 klog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
605605 return nil
606606 }
607- return fmt .Errorf ("unknown Insert disk error: %v " , err )
607+ return fmt .Errorf ("unknown Insert disk error: %w " , err )
608608 }
609609 klog .V (5 ).Infof ("InsertDisk operation %s for disk %s" , opName , diskToCreate .Name )
610610
@@ -626,7 +626,7 @@ func (cloud *CloudProvider) insertZonalDisk(
626626 klog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
627627 return nil
628628 }
629- return fmt .Errorf ("unknown Insert disk operation error: %v " , err )
629+ return fmt .Errorf ("unknown Insert disk operation error: %w " , err )
630630 }
631631 return nil
632632}
@@ -685,7 +685,7 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
685685
686686 deviceName , err := common .GetDeviceName (volKey )
687687 if err != nil {
688- return fmt .Errorf ("failed to get device name: %v " , err )
688+ return fmt .Errorf ("failed to get device name: %w " , err )
689689 }
690690 attachedDiskV1 := & computev1.AttachedDisk {
691691 DeviceName : deviceName ,
@@ -697,13 +697,13 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
697697
698698 op , err := cloud .service .Instances .AttachDisk (project , instanceZone , instanceName , attachedDiskV1 ).Context (ctx ).Do ()
699699 if err != nil {
700- return fmt .Errorf ("failed cloud service attach disk call: %v " , err )
700+ return fmt .Errorf ("failed cloud service attach disk call: %w " , err )
701701 }
702702 klog .V (5 ).Infof ("AttachDisk operation %s for disk %s" , op .Name , attachedDiskV1 .DeviceName )
703703
704704 err = cloud .waitForZonalOp (ctx , project , op .Name , instanceZone )
705705 if err != nil {
706- return fmt .Errorf ("failed when waiting for zonal op: %v " , err )
706+ return fmt .Errorf ("failed when waiting for zonal op: %w " , err )
707707 }
708708 return nil
709709}
@@ -814,7 +814,7 @@ func (cloud *CloudProvider) WaitForAttach(ctx context.Context, project string, v
814814 klog .V (6 ).Infof ("Polling for attach of disk %v to instance %v to complete for %v" , volKey .Name , instanceName , time .Since (start ))
815815 disk , err := cloud .GetDisk (ctx , project , volKey , GCEAPIVersionV1 )
816816 if err != nil {
817- return false , fmt .Errorf ("GetDisk failed to get disk: %v " , err )
817+ return false , fmt .Errorf ("GetDisk failed to get disk: %w " , err )
818818 }
819819
820820 if disk == nil {
@@ -946,7 +946,7 @@ func (cloud *CloudProvider) waitForImageCreation(ctx context.Context, project, i
946946 klog .V (6 ).Infof ("Checking GCE Image %s." , imageName )
947947 image , err := cloud .GetImage (ctx , project , imageName )
948948 if err != nil {
949- klog .Warningf ("Error in getting image %s, %v" , imageName , err )
949+ klog .Warningf ("Error in getting image %s, %v" , imageName , err . Error () )
950950 } else if image != nil {
951951 if image .Status != "PENDING" {
952952 klog .V (6 ).Infof ("Image %s status is %s" , imageName , image .Status )
@@ -1009,7 +1009,7 @@ func (cloud *CloudProvider) ResizeDisk(ctx context.Context, project string, volK
10091009 klog .V (5 ).Infof ("Resizing disk %v to size %v" , volKey , requestBytes )
10101010 cloudDisk , err := cloud .GetDisk (ctx , project , volKey , GCEAPIVersionV1 )
10111011 if err != nil {
1012- return - 1 , fmt .Errorf ("failed to get disk: %v " , err )
1012+ return - 1 , fmt .Errorf ("failed to get disk: %w " , err )
10131013 }
10141014
10151015 sizeGb := cloudDisk .GetSizeGb ()
@@ -1037,13 +1037,13 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
10371037 }
10381038 op , err := cloud .service .Disks .Resize (project , volKey .Zone , volKey .Name , resizeReq ).Context (ctx ).Do ()
10391039 if err != nil {
1040- return - 1 , fmt .Errorf ("failed to resize zonal volume %v: %v " , volKey .String (), err )
1040+ return - 1 , fmt .Errorf ("failed to resize zonal volume %v: %w " , volKey .String (), err )
10411041 }
10421042 klog .V (5 ).Infof ("ResizeDisk operation %s for disk %s" , op .Name , volKey .Name )
10431043
10441044 err = cloud .waitForZonalOp (ctx , project , op .Name , volKey .Zone )
10451045 if err != nil {
1046- return - 1 , fmt .Errorf ("failed waiting for op for zonal resize for %s: %v " , volKey .String (), err )
1046+ return - 1 , fmt .Errorf ("failed waiting for op for zonal resize for %s: %w " , volKey .String (), err )
10471047 }
10481048
10491049 return requestGb , nil
@@ -1056,13 +1056,13 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
10561056
10571057 op , err := cloud .service .RegionDisks .Resize (project , volKey .Region , volKey .Name , resizeReq ).Context (ctx ).Do ()
10581058 if err != nil {
1059- return - 1 , fmt .Errorf ("failed to resize regional volume %v: %v " , volKey .String (), err )
1059+ return - 1 , fmt .Errorf ("failed to resize regional volume %v: %w " , volKey .String (), err )
10601060 }
10611061 klog .V (5 ).Infof ("ResizeDisk operation %s for disk %s" , op .Name , volKey .Name )
10621062
10631063 err = cloud .waitForRegionalOp (ctx , project , op .Name , volKey .Region )
10641064 if err != nil {
1065- return - 1 , fmt .Errorf ("failed waiting for op for regional resize for %s: %v " , volKey .String (), err )
1065+ return - 1 , fmt .Errorf ("failed waiting for op for regional resize for %s: %w " , volKey .String (), err )
10661066 }
10671067
10681068 return requestGb , nil
@@ -1114,7 +1114,7 @@ func (cloud *CloudProvider) waitForSnapshotCreation(ctx context.Context, project
11141114 klog .V (6 ).Infof ("Checking GCE Snapshot %s." , snapshotName )
11151115 snapshot , err := cloud .GetSnapshot (ctx , project , snapshotName )
11161116 if err != nil {
1117- klog .Warningf ("Error in getting snapshot %s, %v" , snapshotName , err )
1117+ klog .Warningf ("Error in getting snapshot %s, %v" , snapshotName , err . Error () )
11181118 } else if snapshot != nil {
11191119 if snapshot .Status != "CREATING" {
11201120 klog .V (6 ).Infof ("Snapshot %s status is %s" , snapshotName , snapshot .Status )
@@ -1161,7 +1161,7 @@ func encodeTags(tags map[string]string) (string, error) {
11611161
11621162 enc , err := json .Marshal (tags )
11631163 if err != nil {
1164- return "" , fmt .Errorf ("failed to encodeTags %v: %v " , tags , err )
1164+ return "" , fmt .Errorf ("failed to encodeTags %v: %w " , tags , err )
11651165 }
11661166 return string (enc ), nil
11671167}
0 commit comments