diff options
| -rw-r--r-- | cmd/seaweedfs-csi-driver/Dockerfile.dev | 2 | ||||
| -rw-r--r-- | deploy/nomad/README.md | 2 | ||||
| -rw-r--r-- | pkg/driver/controllerserver.go | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cmd/seaweedfs-csi-driver/Dockerfile.dev b/cmd/seaweedfs-csi-driver/Dockerfile.dev index 8e758a6..38c164a 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile.dev +++ b/cmd/seaweedfs-csi-driver/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.23-alpine as builder +FROM golang:1.24-alpine as builder RUN apk add git g++ diff --git a/deploy/nomad/README.md b/deploy/nomad/README.md index 65030c3..3a1f53f 100644 --- a/deploy/nomad/README.md +++ b/deploy/nomad/README.md @@ -8,7 +8,7 @@ You can skip this part if you have already running seaweedfs. Assumptions: - Running Nomad cluster - At least 3 nodes with static IP addresses - - Enabled memroy oversuscription (https://learn.hashicorp.com/tutorials/nomad/memory-oversubscription?in=nomad%2Fadvanced-scheduling) + - Enabled memory oversubscription (https://learn.hashicorp.com/tutorials/nomad/memory-oversubscription?in=nomad%2Fadvanced-scheduling) - Running PostgreSQL instance for filer ```shell diff --git a/pkg/driver/controllerserver.go b/pkg/driver/controllerserver.go index 3a2d9fc..b7fb1bb 100644 --- a/pkg/driver/controllerserver.go +++ b/pkg/driver/controllerserver.go @@ -53,8 +53,8 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol glog.V(4).Infof("params:%v", params) capacity := req.GetCapacityRange().GetRequiredBytes() - if err := filer_pb.Mkdir(cs.Driver, "/buckets", volumeId, nil); err != nil { - return nil, fmt.Errorf("error setting bucket metadata: %v", err) + if err := filer_pb.Mkdir(ctx, cs.Driver, "/buckets", volumeId, nil); err != nil { + return nil, fmt.Errorf("error creating bucket: %v", err) } glog.V(4).Infof("volume created %s", volumeId) @@ -84,8 +84,8 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol } glog.V(4).Infof("deleting volume %s", volumeId) - if err := filer_pb.Remove(cs.Driver, "/buckets", volumeId, true, true, true, false, nil); err != nil { - return nil, fmt.Errorf("error setting bucket metadata: %v", err) + if err := filer_pb.Remove(ctx, cs.Driver, "/buckets", volumeId, true, true, true, false, nil); err != nil { + return nil, fmt.Errorf("error deleting bucket: %v", err) } return &csi.DeleteVolumeResponse{}, nil @@ -135,7 +135,7 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req return nil, status.Error(codes.InvalidArgument, "Volume capabilities missing in request") } - exists, err := filer_pb.Exists(cs.Driver, "/buckets", req.GetVolumeId(), true) + exists, err := filer_pb.Exists(ctx, cs.Driver, "/buckets", req.GetVolumeId(), true) if err != nil { return nil, fmt.Errorf("error checking bucket %s exists: %v", req.GetVolumeId(), err) } |