Skip to content

Commit

Permalink
Merge pull request #15294 from adelton/flex-bind-mount
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

UPSTREAM: 49118: Allow unmounting bind-mounted directories.

For files, we cannot use `path/..`;
we could use `filepath.Dir` but for bind-mounted, `isNotMounted`
which calls `IsLikelyNotMountPoint` would not work anyway.
Let's just have the driver do the work.

Addressing
```
Error: UnmountVolume.TearDown failed for volume "..." (volume.spec.Name: "...") pod "..." (UID: "...") with: lstat /path/.../test-flex/..: not a directory
```
  • Loading branch information
openshift-merge-robot committed Aug 12, 2017
2 parents 549c36f + 139e0d5 commit ef7d658
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions vendor/k8s.io/kubernetes/pkg/volume/flexvolume/unmounter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ef7d658

Please sign in to comment.