From 959bfe420135096aba4918af3c9aeb01104d1289 Mon Sep 17 00:00:00 2001
From: Mathusan Selvarajah <mselvara@redhat.com>
Date: Mon, 15 Apr 2019 11:21:36 -0400
Subject: [PATCH] update nfs driver for kube 1.14

---
 pkg/nfs/controllerserver.go | 23 +++++++++++++++++++++++
 pkg/nfs/driver.go           |  2 +-
 pkg/nfs/nodeserver.go       | 10 ++++++----
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 pkg/nfs/controllerserver.go

diff --git a/pkg/nfs/controllerserver.go b/pkg/nfs/controllerserver.go
new file mode 100644
index 00000000..67267d74
--- /dev/null
+++ b/pkg/nfs/controllerserver.go
@@ -0,0 +1,23 @@
+package nfs
+
+import (
+	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/kubernetes-csi/drivers/pkg/csi-common"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type ControllerServer struct {
+	*csicommon.DefaultControllerServer
+}
+
+func (cs ControllerServer) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest) (*csi.ControllerExpandVolumeResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "")
+}
+
+func getControllerServer(csiDriver *csicommon.CSIDriver) ControllerServer {
+	return ControllerServer{
+		csicommon.NewDefaultControllerServer(csiDriver),
+	}
+}
diff --git a/pkg/nfs/driver.go b/pkg/nfs/driver.go
index c547da0d..0cb47e7a 100644
--- a/pkg/nfs/driver.go
+++ b/pkg/nfs/driver.go
@@ -72,7 +72,7 @@ func (d *driver) Run() {
 		csicommon.NewDefaultIdentityServer(d.csiDriver),
 		// NFS plugin has not implemented ControllerServer
 		// using default controllerserver.
-		csicommon.NewDefaultControllerServer(d.csiDriver),
+		getControllerServer(d.csiDriver),
 		NewNodeServer(d))
 	s.Wait()
 }
diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go
index 36ced455..a58eff26 100644
--- a/pkg/nfs/nodeserver.go
+++ b/pkg/nfs/nodeserver.go
@@ -22,13 +22,11 @@ import (
 	"strings"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/volume/util"
-
-	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 
 type nodeServer struct {
@@ -92,7 +90,7 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
 		return nil, status.Error(codes.NotFound, "Volume not mounted")
 	}
 
-	err = util.UnmountPath(req.GetTargetPath(), mount.New(""))
+	err = mount.CleanupMountPoint(req.GetTargetPath(), mount.New(""), false)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
@@ -107,3 +105,7 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
 	return &csi.NodeStageVolumeResponse{}, nil
 }
+
+func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "")
+}