From 7c1a4647fa9ba9e20d866f26f1bb704d5dc1d58c Mon Sep 17 00:00:00 2001 From: whg517 Date: Mon, 30 Dec 2024 19:37:32 +0800 Subject: [PATCH] refactor: remove maintain global state pvs (#189) --- internal/csi/controller.go | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/internal/csi/controller.go b/internal/csi/controller.go index 084c34b..3e992f8 100644 --- a/internal/csi/controller.go +++ b/internal/csi/controller.go @@ -37,16 +37,14 @@ var ( type ControllerServer struct { csi.UnimplementedControllerServer - client client.Client - volumes map[string]int64 + client client.Client } var _ csi.ControllerServer = &ControllerServer{} func NewControllerServer(client client.Client) *ControllerServer { return &ControllerServer{ - client: client, - volumes: map[string]int64{}, + client: client, } } @@ -56,11 +54,7 @@ func (c *ControllerServer) CreateVolume(ctx context.Context, request *csi.Create } requiredCap := request.CapacityRange.GetRequiredBytes() - if existCap, ok := c.volumes[request.Name]; ok && existCap < requiredCap { - return nil, status.Errorf(codes.AlreadyExists, "Volume: %q, capacity bytes: %d", request.Name, requiredCap) - } - c.volumes[request.Name] = requiredCap if request.Parameters["secretFinalizer"] == "true" { logger.V(1).Info("Finalizer is true") } @@ -189,11 +183,6 @@ func (c *ControllerServer) DeleteVolume(ctx context.Context, request *csi.Delete return &csi.DeleteVolumeResponse{}, nil } - if _, ok := c.volumes[request.VolumeId]; !ok { - // return nil, status.Errorf(codes.NotFound, "Volume ID: %q", request.VolumeId) - logger.V(1).Info("Volume not found, skip delete volume") - } - return &csi.DeleteVolumeResponse{}, nil } @@ -233,24 +222,7 @@ func (c *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, reque } func (c *ControllerServer) ListVolumes(ctx context.Context, request *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) { - // impl list volumes - entries := make([]*csi.ListVolumesResponse_Entry, 0, len(c.volumes)) - for volumeID, size := range c.volumes { - entries = append(entries, &csi.ListVolumesResponse_Entry{ - Volume: &csi.Volume{ - VolumeId: volumeID, - CapacityBytes: size, - VolumeContext: nil, - ContentSource: nil, - AccessibleTopology: nil, - }, - }) - } - - return &csi.ListVolumesResponse{ - Entries: entries, - }, nil - + return nil, status.Error(codes.Unimplemented, "") } func (c *ControllerServer) ControllerGetCapabilities(ctx context.Context, request *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {