From 263c45bb458ed8bf05fa5c4148fa76d83ca3871e Mon Sep 17 00:00:00 2001 From: Huamin Chen Date: Wed, 16 Jan 2019 13:52:45 -0500 Subject: [PATCH] enable csi block; use canary external-provisioner image to pick up block volume provisioning Signed-off-by: Huamin Chen --- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 3 +-- pkg/rbd/controllerserver.go | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 966b49260..fd7e3c634 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -27,9 +27,8 @@ spec: serviceAccount: csi-provisioner containers: - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v1.0.0 + image: quay.io/k8scsi/csi-provisioner:canary args: - - "--provisioner=csi-rbdplugin" - "--csi-address=$(ADDRESS)" - "--v=5" env: diff --git a/pkg/rbd/controllerserver.go b/pkg/rbd/controllerserver.go index 8dff0c35e..bccfe6e4a 100644 --- a/pkg/rbd/controllerserver.go +++ b/pkg/rbd/controllerserver.go @@ -77,11 +77,6 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol if req.VolumeCapabilities == nil { return nil, status.Error(codes.InvalidArgument, "Volume Capabilities cannot be empty") } - for _, cap := range req.VolumeCapabilities { - if cap.GetBlock() != nil { - return nil, status.Error(codes.Unimplemented, "Block Volume not supported") - } - } volumeNameMutex.LockKey(req.GetName()) defer volumeNameMutex.UnlockKey(req.GetName())