From bbfda9cdfe54aee7391bac8b908af5bde4f06fe3 Mon Sep 17 00:00:00 2001 From: Harsh Desai Date: Mon, 22 May 2017 15:16:07 -0700 Subject: [PATCH] Remove call to common unmount routine as Portworx takes care of all umount workflow --- pkg/volume/portworx/BUILD | 1 - pkg/volume/portworx/portworx.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/pkg/volume/portworx/BUILD b/pkg/volume/portworx/BUILD index 7fce0f30338..e751cf0b1a3 100644 --- a/pkg/volume/portworx/BUILD +++ b/pkg/volume/portworx/BUILD @@ -38,7 +38,6 @@ go_library( "//pkg/util/mount:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", - "//pkg/volume/util:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api/client:go_default_library", diff --git a/pkg/volume/portworx/portworx.go b/pkg/volume/portworx/portworx.go index 95b1551440a..c63a237adb3 100644 --- a/pkg/volume/portworx/portworx.go +++ b/pkg/volume/portworx/portworx.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/util/mount" kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/util" ) // This is the primary entrypoint for volume plugins. @@ -315,11 +314,6 @@ func (c *portworxVolumeUnmounter) TearDown() error { // resource was the last reference to that disk on the kubelet. func (c *portworxVolumeUnmounter) TearDownAt(dir string) error { glog.V(4).Infof("Portworx Volume TearDown of %s", dir) - // Unmount the bind mount inside the pod - if err := util.UnmountPath(dir, c.mounter); err != nil { - return err - } - // Call Portworx Unmount for Portworx's book-keeping. if err := c.manager.UnmountVolume(c, dir); err != nil { return err