Skip to content

K
k3s
Commit 0d0f2e55 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52365 from grebois/patch-1

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. GlusterFS plugin fails to mount volumes in 1.7.3 branch #50463
parents 04673ab6 a2aa3621
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/volume/glusterfs/glusterfs.go
View file @ 0d0f2e55
...@@ -346,8 +346,8 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error { ...@@ -346,8 +346,8 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
return nil return nil
} }
const invalidOption = "Invalid option auto_unmount" if dstrings.Contains(errs.Error(), "Invalid option auto_unmount") ||
if dstrings.Contains(errs.Error(), invalidOption) { dstrings.Contains(errs.Error(), "Invalid argument") {
// Give a try without `auto_unmount` mount option, because // Give a try without `auto_unmount` mount option, because
// it could be that gluster fuse client is older version and // it could be that gluster fuse client is older version and
// mount.glusterfs is unaware of `auto_unmount`. // mount.glusterfs is unaware of `auto_unmount`.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment