Skip to content

Commit 75188fd

Browse files
committed
Remove error return that is now unused
1 parent 2f6d81a commit 75188fd

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

pkg/gce-pd-csi-driver/controller.go

+4-13
Original file line numberDiff line numberDiff line change
@@ -522,11 +522,7 @@ func (gceCS *GCEControllerServer) createMultiZoneDisk(ctx context.Context, req *
522522
volumeId := fmt.Sprintf("projects/%s/zones/%s/disks/%s", gceCS.CloudProvider.GetDefaultProject(), common.MultiZoneValue, req.GetName())
523523
klog.V(4).Infof("CreateVolume succeeded for multi-zone disks in zones %s: %v", zones, multiZoneVolKey)
524524

525-
resp, err := gceCS.generateCreateVolumeResponseWithVolumeId(createdDisks[0], zones, params, dataCacheParams, enableDataCache, volumeId)
526-
if err != nil {
527-
return nil, fmt.Errorf("failed to generate createVolumeResponse: %w", err)
528-
}
529-
return resp, nil
525+
return gceCS.generateCreateVolumeResponseWithVolumeId(createdDisks[0], zones, params, dataCacheParams, enableDataCache, volumeId), nil
530526
}
531527

532528
func (gceCS *GCEControllerServer) getZonesWithDiskNameAndType(ctx context.Context, name string, diskType string) ([]string, error) {
@@ -632,12 +628,7 @@ func (gceCS *GCEControllerServer) createSingleDeviceDisk(ctx context.Context, re
632628
return nil, common.LoggedError("CreateVolume failed: %v", err)
633629
}
634630

635-
resp, err := gceCS.generateCreateVolumeResponseWithVolumeId(disk, zones, params, dataCacheParams, enableDataCache, volumeID)
636-
if err != nil {
637-
return nil, fmt.Errorf("failed to generate createVolumeResponse: %w", err)
638-
}
639-
640-
return resp, nil
631+
return gceCS.generateCreateVolumeResponseWithVolumeId(disk, zones, params, dataCacheParams, enableDataCache, volumeID), nil
641632
}
642633

643634
func getAccessMode(req *csi.CreateVolumeRequest, params common.DiskParameters) (string, error) {
@@ -2418,7 +2409,7 @@ func extractVolumeContext(context map[string]string) (*PDCSIContext, error) {
24182409
return info, nil
24192410
}
24202411

2421-
func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk *gce.CloudDisk, zones []string, params common.DiskParameters, dataCacheParams common.DataCacheParameters, enableDataCache bool, volumeId string) (*csi.CreateVolumeResponse, error) {
2412+
func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk *gce.CloudDisk, zones []string, params common.DiskParameters, dataCacheParams common.DataCacheParameters, enableDataCache bool, volumeId string) *csi.CreateVolumeResponse {
24222413
tops := []*csi.Topology{}
24232414
for _, zone := range zones {
24242415
top := &csi.Topology{
@@ -2485,7 +2476,7 @@ func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk
24852476
}
24862477
createResp.Volume.ContentSource = contentSource
24872478
}
2488-
return createResp, nil
2479+
return createResp
24892480
}
24902481

24912482
func getResourceId(resourceLink string) (string, error) {

0 commit comments

Comments
 (0)