From 616e6bc6fe678dcacb3b13e08af36f78a7c8c9f0 Mon Sep 17 00:00:00 2001 From: Raunak Kumar Date: Tue, 8 Jun 2021 11:30:01 -0700 Subject: [PATCH] update vendor (#278) Signed-off-by: Raunak --- go.mod | 2 +- go.sum | 4 ++++ .../hpe-storage/common-host-libs/linux/mount.go | 11 +++++++++++ vendor/modules.txt | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 216f306e..7a88541d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.12.0 // indirect github.com/hashicorp/golang-lru v0.5.3 // indirect - github.com/hpe-storage/common-host-libs v4.2.1-0.20210519154202-8a8f68fe84db+incompatible + github.com/hpe-storage/common-host-libs v4.2.1-0.20210608172014-97cb25c9f147+incompatible github.com/hpe-storage/k8s-custom-resources v0.0.0-20201216052928-e2854a36f3f9 github.com/jonboulle/clockwork v0.1.0 // indirect github.com/kubernetes-csi/csi-lib-utils v0.7.1 diff --git a/go.sum b/go.sum index ed734876..946cfbe2 100644 --- a/go.sum +++ b/go.sum @@ -269,6 +269,10 @@ github.com/hpe-storage/common-host-libs v4.2.1-0.20210519131515-4119420effbb+inc github.com/hpe-storage/common-host-libs v4.2.1-0.20210519131515-4119420effbb+incompatible/go.mod h1:qQxvwt4l9C79p2V8bY1P13As1+ylyznKJVp3K2P5bz8= github.com/hpe-storage/common-host-libs v4.2.1-0.20210519154202-8a8f68fe84db+incompatible h1:7t/v4pxOTVOq5pKlapxJ2RiklV+rk9gI2BFj7BMgrWg= github.com/hpe-storage/common-host-libs v4.2.1-0.20210519154202-8a8f68fe84db+incompatible/go.mod h1:qQxvwt4l9C79p2V8bY1P13As1+ylyznKJVp3K2P5bz8= +github.com/hpe-storage/common-host-libs v4.2.1-0.20210607202332-3e783e9ed561+incompatible h1:gDQjaZbYSKdbpVugMSeLIKjUl/qQ17qv3mM0Uwu51qc= +github.com/hpe-storage/common-host-libs v4.2.1-0.20210607202332-3e783e9ed561+incompatible/go.mod h1:qQxvwt4l9C79p2V8bY1P13As1+ylyznKJVp3K2P5bz8= +github.com/hpe-storage/common-host-libs v4.2.1-0.20210608172014-97cb25c9f147+incompatible h1:y37GOStihsPDe2RPa+TgSCBATAmbnC7n7ZOiXia3Hac= +github.com/hpe-storage/common-host-libs v4.2.1-0.20210608172014-97cb25c9f147+incompatible/go.mod h1:qQxvwt4l9C79p2V8bY1P13As1+ylyznKJVp3K2P5bz8= github.com/hpe-storage/k8s-custom-resources v0.0.0-20190828052325-42886f48215c h1:M/4pHhSouEEjd613SFODOskZmn6pS5tWITHdA8MPWMI= github.com/hpe-storage/k8s-custom-resources v0.0.0-20190828052325-42886f48215c/go.mod h1:qYST/Hepa2MRB85zskShx/+WlbUG5bmq/orhy6sA2jE= github.com/hpe-storage/k8s-custom-resources v0.0.0-20201216052928-e2854a36f3f9 h1:kC0UlG2zL6ZkcsgYmhhUiw2NGEsZ8RA1A6K55wq4noo= diff --git a/vendor/github.com/hpe-storage/common-host-libs/linux/mount.go b/vendor/github.com/hpe-storage/common-host-libs/linux/mount.go index fe21a6d1..c08441e4 100644 --- a/vendor/github.com/hpe-storage/common-host-libs/linux/mount.go +++ b/vendor/github.com/hpe-storage/common-host-libs/linux/mount.go @@ -589,6 +589,17 @@ func MountNFSShare(source string, targetPath string, options []string, nfsType s nfsType = defaultNFSType } + mountedSource, _ := GetDeviceFromMountPoint(targetPath) + if mountedSource != "" { + // the source exists for the target path but differs from the expected mount, return error + if mountedSource != source { + err := fmt.Errorf("%s is already mounted at %s. Skipping mount for %s", mountedSource, source, targetPath) + return err + } + // if mount point present with expected targetPath, return successful + return nil + } + args := []string{fmt.Sprintf("-t%s", nfsType), source, targetPath} optionArgs := []string{} if len(options) != 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 58d93dab..f55fdc7a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -74,7 +74,7 @@ github.com/hpcloud/tail/ratelimiter github.com/hpcloud/tail/util github.com/hpcloud/tail/watch github.com/hpcloud/tail/winfile -# github.com/hpe-storage/common-host-libs v4.2.1-0.20210519154202-8a8f68fe84db+incompatible +# github.com/hpe-storage/common-host-libs v4.2.1-0.20210608172014-97cb25c9f147+incompatible github.com/hpe-storage/common-host-libs/chapi github.com/hpe-storage/common-host-libs/concurrent github.com/hpe-storage/common-host-libs/connectivity