From aa9ec2da56bd47166c42de06af087d4932311652 Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Wed, 28 Feb 2018 20:13:28 -0500 Subject: [PATCH] refactor csi-common and hostpath plugin for CSI 0.2.0 spec --- pkg/nfs/driver.go | 14 ++++---------- pkg/nfs/nodeserver.go | 10 +++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkg/nfs/driver.go b/pkg/nfs/driver.go index 94408f48..fbf4c9c8 100644 --- a/pkg/nfs/driver.go +++ b/pkg/nfs/driver.go @@ -17,7 +17,7 @@ limitations under the License. package nfs import ( - "github.com/container-storage-interface/spec/lib/go/csi" + "github.com/container-storage-interface/spec/lib/go/csi/v0" "github.com/golang/glog" "github.com/kubernetes-csi/drivers/pkg/csi-common" @@ -39,23 +39,17 @@ const ( ) var ( - version = csi.Version{ - Minor: 1, - } + version = "0.2.0" ) -func GetSupportedVersions() []*csi.Version { - return []*csi.Version{&version} -} - func NewDriver(nodeID, endpoint string) *driver { - glog.Infof("Driver: %v version: %v", driverName, csicommon.GetVersionString(&version)) + glog.Infof("Driver: %v version: %v", driverName, version) d := &driver{} d.endpoint = endpoint - csiDriver := csicommon.NewCSIDriver(driverName, &version, GetSupportedVersions(), nodeID) + csiDriver := csicommon.NewCSIDriver(driverName, version, nodeID) csiDriver.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER}) d.csiDriver = csiDriver diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go index 635b7bfc..ba784ce3 100644 --- a/pkg/nfs/nodeserver.go +++ b/pkg/nfs/nodeserver.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/container-storage-interface/spec/lib/go/csi" + "github.com/container-storage-interface/spec/lib/go/csi/v0" "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -99,3 +99,11 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu return &csi.NodeUnpublishVolumeResponse{}, nil } + +func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) { + return &csi.NodeUnstageVolumeResponse{}, nil +} + +func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) { + return &csi.NodeStageVolumeResponse{}, nil +}