From 5c2298bd215959d78c881e5d48d96569b83ab3c7 Mon Sep 17 00:00:00 2001 From: Viktor Kuzmin Date: Tue, 28 Sep 2021 23:06:05 +0300 Subject: Allow static persistent volumes, some code cleanup --- pkg/driver/controllerserver.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'pkg/driver/controllerserver.go') diff --git a/pkg/driver/controllerserver.go b/pkg/driver/controllerserver.go index 0e07291..c57a72a 100644 --- a/pkg/driver/controllerserver.go +++ b/pkg/driver/controllerserver.go @@ -39,16 +39,8 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } params := req.GetParameters() - glog.V(4).Info("params:%v", params) + glog.V(4).Infof("params:%v", params) capacity := req.GetCapacityRange().GetRequiredBytes() - capacityGB := capacity >> 30 - if capacityGB == 0 { - return nil, status.Error(codes.InvalidArgument, "required bytes less than 1GB") - } - seaweedFsVolumeCount := capacityGB / 30 - if seaweedFsVolumeCount == 0 { - seaweedFsVolumeCount = 1 - } if err := filer_pb.Mkdir(cs.Driver, "/buckets", volumeId, nil); err != nil { return nil, fmt.Errorf("Error setting bucket metadata: %v", err) @@ -59,7 +51,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol return &csi.CreateVolumeResponse{ Volume: &csi.Volume{ VolumeId: volumeId, - CapacityBytes: capacity, // 0, // seaweedFsVolumeCount * 1024 * 1024 * 30, + CapacityBytes: capacity, VolumeContext: params, }, }, nil -- cgit v1.2.3