From 06401e326223eee018d8e21efb77deeaf76bd323 Mon Sep 17 00:00:00 2001 From: pmint93 Date: Tue, 29 Nov 2022 11:12:36 +0700 Subject: [PATCH 1/2] Fix bug cause driver CreateVolume to break due to InvalidArgument --- driver/controller.go | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/driver/controller.go b/driver/controller.go index 0d25efa..2b60db5 100644 --- a/driver/controller.go +++ b/driver/controller.go @@ -20,7 +20,6 @@ package driver import ( "errors" "fmt" - "strings" "time" @@ -34,16 +33,7 @@ import ( "k8s.io/klog" ) -const ( - RFC3339MilliNoZ = "2006-01-02T15:04:05.999999" - PVCNameKey = "csi.storage.k8s.io/pvc/name" - PVCNamespaceKey = "csi.storage.k8s.io/pvc/namespace" -) - -var ( - volPVCName string - volPVCNamespace string -) +const RFC3339MilliNoZ = "2006-01-02T15:04:05.999999" type controllerServer struct { Driver *VolumeDriver @@ -83,15 +73,13 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol volAvailability = req.GetParameters()["availability"] } - for key, value := range req.GetParameters() { - switch strings.ToLower(key) { - case PVCNameKey: - volPVCName = value - case PVCNamespaceKey: - volPVCNamespace = value - default: - return nil, status.Errorf(codes.InvalidArgument, "Invalid parameter key %s for CreateVolume", key) - } + volPVCName, ok := req.GetParameters()["csi.storage.k8s.io/pvc/name"] + if !ok { + volPVCName = "unknown" + } + volPVCNamespace, ok := req.GetParameters()["csi.storage.k8s.io/pvc/namespace"] + if !ok { + volPVCNamespace = "unknown" } Description := volPVCNamespace + "/" + volPVCName + " by csi-bizflycloud" From 0197936dc4de46eb39becbe8d44da17943742ad8 Mon Sep 17 00:00:00 2001 From: pmint93 Date: Tue, 29 Nov 2022 11:13:02 +0700 Subject: [PATCH 2/2] Bump driver version to 0.3.0 --- driver/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver/driver.go b/driver/driver.go index 0bae95d..b2110c8 100644 --- a/driver/driver.go +++ b/driver/driver.go @@ -31,7 +31,7 @@ const ( ) var ( - version = "0.2" + version = "0.3.0" ) type VolumeDriver struct {