kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove capacity setting in create Volume response

Browse Source
This commit is contained in:
Manohar Reddy 2021-05-05 15:42:48 +00:00
parent fa61d6ee15
commit 98ec1a8aaf
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/nfs/controllerserver.go
View File

@ -104,9 +104,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
if err = os.Mkdir(internalVolumePath, 0777); err != nil && !os.IsExist(err) { if err = os.Mkdir(internalVolumePath, 0777); err != nil && !os.IsExist(err) {
return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error()) return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())
} }
// Remove capacity setting when provisioner 1.4.0 is available with fix for return &csi.CreateVolumeResponse{Volume: cs.nfsVolToCSI(nfsVol)}, nil
// https://github.com/kubernetes-csi/external-provisioner/pull/271
return &csi.CreateVolumeResponse{Volume: cs.nfsVolToCSI(nfsVol, reqCapacity)}, nil
} }
// DeleteVolume delete a volume // DeleteVolume delete a volume
@ -338,9 +336,9 @@ func (cs *ControllerServer) getVolumeSharePath(vol *nfsVolume) string {
} }
// Convert into nfsVolume into a csi.Volume // Convert into nfsVolume into a csi.Volume
func (cs *ControllerServer) nfsVolToCSI(vol *nfsVolume, reqCapacity int64) *csi.Volume { func (cs *ControllerServer) nfsVolToCSI(vol *nfsVolume) *csi.Volume {
return &csi.Volume{ return &csi.Volume{
CapacityBytes: reqCapacity, CapacityBytes: 0, // by setting it to zero, Provisioner will use PVC requested size as PV size
VolumeId: vol.id, VolumeId: vol.id,
VolumeContext: map[string]string{ VolumeContext: map[string]string{
paramServer: vol.server, paramServer: vol.server,