fix(multi-attach): remove volume attach-detach functionality (#134)

Signed-off-by: Payes Anand <[email protected]>

deploy/csi-operator.yaml

@@ -675,7 +675,7 @@ spec:
   # To determine at runtime which mode a volume uses, pod info and its
   # "csi.storage.k8s.io/ephemeral" entry are needed.
   podInfoOnMount: true
-  attachRequired: true
+  attachRequired: false
 ---
 
 kind: ClusterRoleBinding

deploy/csidriver.yaml

@@ -10,4 +10,4 @@ spec:
   # To determine at runtime which mode a volume uses, pod info and its
   # "csi.storage.k8s.io/ephemeral" entry are needed.
   podInfoOnMount: true
-  attachRequired: true
+  attachRequired: false

pkg/driver/controller.go

@@ -211,11 +211,7 @@ func (cs *controller) ControllerPublishVolume(
 	req *csi.ControllerPublishVolumeRequest,
 ) (*csi.ControllerPublishVolumeResponse, error) {
 
-	if err := prepareVolumeForNode(req); err != nil {
-		return nil, status.Error(codes.Internal, err.Error())
-	}
-
-	return &csi.ControllerPublishVolumeResponse{}, nil
+	return nil, status.Error(codes.Unimplemented, "")
 }
 
 // ControllerUnpublishVolume removes a previously
@@ -226,10 +222,7 @@ func (cs *controller) ControllerUnpublishVolume(
 	ctx context.Context,
 	req *csi.ControllerUnpublishVolumeRequest,
 ) (*csi.ControllerUnpublishVolumeResponse, error) {
-	if err := utils.DeleteCStorVolumeAttachmentCR(req.GetVolumeId() + "-" + req.GetNodeId()); err != nil {
-		return nil, status.Error(codes.Internal, err.Error())
-	}
-	return &csi.ControllerUnpublishVolumeResponse{}, nil
+	return nil, status.Error(codes.Unimplemented, "")
 }
 
 // ControllerExpandVolume resizes previously provisioned volume

pkg/driver/controller_utils.go

@@ -18,16 +18,11 @@ package driver
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	apis "github.com/openebs/cstor-csi/pkg/apis/cstor/v1"
-	"github.com/openebs/cstor-csi/pkg/cstor/volumeattachment"
-	utils "github.com/openebs/cstor-csi/pkg/utils"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	k8serror "k8s.io/apimachinery/pkg/api/errors"
 )
 
 // SupportedVolumeCapabilityAccessModes contains the list of supported access
@@ -56,7 +51,6 @@ func newControllerCapabilities() []*csi.ControllerServiceCapability {
 	var capabilities []*csi.ControllerServiceCapability
 	for _, cap := range []csi.ControllerServiceCapability_RPC_Type{
 		csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
-		csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME,
 		csi.ControllerServiceCapability_RPC_EXPAND_VOLUME,
 		csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT,
 		csi.ControllerServiceCapability_RPC_CLONE_VOLUME,
@@ -201,68 +195,3 @@ func (cs *controller) validateDeleteVolumeReq(req *csi.DeleteVolumeRequest) erro
 	}
 	return nil
 }
-
-func prepareVolumeForNode(
-	req *csi.ControllerPublishVolumeRequest,
-) error {
-	volumeID := req.GetVolumeId()
-	nodeID := req.GetNodeId()
-
-	if err := utils.PatchCVCNodeID(volumeID, nodeID); err != nil {
-		return err
-	}
-
-	labels := map[string]string{
-		"nodeID":  nodeID,
-		"Volname": volumeID,
-	}
-
-	// If the access type is block, do nothing for stage
-	var accessType string
-	switch req.GetVolumeCapability().GetAccessType().(type) {
-	case *csi.VolumeCapability_Block:
-		accessType = "block"
-	case *csi.VolumeCapability_Mount:
-		accessType = "mount"
-	}
-
-	vol, err := volumeattachment.NewBuilder().
-		WithName(volumeID + "-" + nodeID).
-		WithLabels(labels).
-		WithVolName(req.GetVolumeId()).
-		WithAccessType(accessType).
-		WithFSType(req.GetVolumeCapability().GetMount().GetFsType()).
-		WithReadOnly(req.GetReadonly()).Build()
-	if err != nil {
-		return err
-	}
-	if isCVCBound, err := utils.IsCVCBound(volumeID); err != nil {
-		return status.Error(codes.Internal, err.Error())
-	} else if !isCVCBound {
-		utils.TransitionVolList[volumeID] = apis.CStorVolumeAttachmentStatusWaitingForCVCBound
-		time.Sleep(10 * time.Second)
-		return errors.New("Waiting for CVC to be bound")
-	}
-
-	if err = utils.FetchAndUpdateISCSIDetails(volumeID, vol); err != nil {
-		return err
-	}
-
-	oldvol, err := utils.GetCStorVolumeAttachment(vol.Name)
-	if err != nil && !k8serror.IsNotFound(err) {
-		return err
-	} else if err == nil && oldvol != nil {
-		if oldvol.DeletionTimestamp != nil {
-			return errors.Errorf("Volume still mounted on node: %s", nodeID)
-		}
-		return nil
-	}
-
-	if err = utils.DeleteOldCStorVolumeAttachmentCRs(volumeID); err != nil {
-		return status.Error(codes.Internal, err.Error())
-	}
-	if err = utils.CreateCStorVolumeAttachmentCR(vol, nodeID); err != nil {
-		return status.Error(codes.Internal, err.Error())
-	}
-	return nil
-}

pkg/driver/node.go

@@ -147,6 +147,10 @@ func (ns *node) NodeStageVolume(
 	}
 	defer removeVolumeFromTransitionList(volumeID)
 
+	if err := ns.prepareVolumeForNode(req); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
 	if vol, err = utils.GetCStorVolumeAttachment(volumeID + "-" + utils.NodeIDENV); err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
@@ -281,6 +285,9 @@ func (ns *node) NodeUnstageVolume(
 	logrus.Infof("cstor-csi: volume %s path: %s has been unmounted.",
 		volumeID, stagingTargetPath)
 
+	if err := utils.DeleteCStorVolumeAttachmentCR(req.GetVolumeId() + "-" + ns.driver.config.NodeID); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
 	return &csi.NodeUnstageVolumeResponse{}, nil
 }
 

pkg/driver/node_utils.go

@@ -22,14 +22,19 @@ import (
 	"path/filepath"
 	"strings"
 
+	"time"
+
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-lib-iscsi/iscsi"
 	apis "github.com/openebs/cstor-csi/pkg/apis/cstor/v1"
+	"github.com/openebs/cstor-csi/pkg/cstor/volumeattachment"
 	iscsiutils "github.com/openebs/cstor-csi/pkg/iscsi"
 	utils "github.com/openebs/cstor-csi/pkg/utils"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	k8serror "k8s.io/apimachinery/pkg/api/errors"
 )
 
 func getTargetIP(url string) string {
@@ -311,3 +316,68 @@ func (ns *node) validateNodeUnStageReq(
 	}
 	return nil
 }
+
+func (ns *node) prepareVolumeForNode(
+	req *csi.NodeStageVolumeRequest,
+) error {
+	volumeID := req.GetVolumeId()
+	nodeID := ns.driver.config.NodeID
+
+	if err := utils.PatchCVCNodeID(volumeID, nodeID); err != nil {
+		return err
+	}
+
+	labels := map[string]string{
+		"nodeID":  nodeID,
+		"Volname": volumeID,
+	}
+
+	// If the access type is block, do nothing for stage
+	var accessType string
+	switch req.GetVolumeCapability().GetAccessType().(type) {
+	case *csi.VolumeCapability_Block:
+		accessType = "block"
+	case *csi.VolumeCapability_Mount:
+		accessType = "mount"
+	}
+
+	vol, err := volumeattachment.NewBuilder().
+		WithName(volumeID + "-" + nodeID).
+		WithLabels(labels).
+		WithVolName(req.GetVolumeId()).
+		WithAccessType(accessType).
+		WithFSType(req.GetVolumeCapability().GetMount().GetFsType()).
+		WithReadOnly(false).Build()
+	if err != nil {
+		return err
+	}
+	if isCVCBound, err := utils.IsCVCBound(volumeID); err != nil {
+		return status.Error(codes.Internal, err.Error())
+	} else if !isCVCBound {
+		utils.TransitionVolList[volumeID] = apis.CStorVolumeAttachmentStatusWaitingForCVCBound
+		time.Sleep(10 * time.Second)
+		return errors.New("Waiting for CVC to be bound")
+	}
+
+	if err = utils.FetchAndUpdateISCSIDetails(volumeID, vol); err != nil {
+		return err
+	}
+
+	oldvol, err := utils.GetCStorVolumeAttachment(vol.Name)
+	if err != nil && !k8serror.IsNotFound(err) {
+		return err
+	} else if err == nil && oldvol != nil {
+		if oldvol.DeletionTimestamp != nil {
+			return errors.Errorf("Volume still mounted on node: %s", nodeID)
+		}
+		return nil
+	}
+
+	if err = utils.DeleteOldCStorVolumeAttachmentCRs(volumeID); err != nil {
+		return status.Error(codes.Internal, err.Error())
+	}
+	if err = utils.CreateCStorVolumeAttachmentCR(vol, nodeID); err != nil {
+		return status.Error(codes.Internal, err.Error())
+	}
+	return nil
+}