Skip to content

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

Merge pull request #49475 from jsafrane/fix-gluster-make

Automatic merge from submit-queue (batch tested with PRs 48911, 49475, 49438, 49362, 49274) Fixed glusterfs mount options Capacity of a slice is the third argument, not the second one. We use append() to fill the slice, so it should be empty at the beginning and with the right capacity. ```release-note NONE ```
parents 97eed3f7 f6a84365
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/volume/glusterfs/glusterfs.go
View file @ 159dcbfb
...@@ -353,7 +353,7 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error { ...@@ -353,7 +353,7 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
// 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`.
noAutoMountOptions := make([]string, len(mountOptions)) noAutoMountOptions := make([]string, 0, len(mountOptions))
for _, opt := range mountOptions { for _, opt := range mountOptions {
if opt != "auto_unmount" { if opt != "auto_unmount" {
noAutoMountOptions = append(noAutoMountOptions, opt) noAutoMountOptions = append(noAutoMountOptions, opt)
......
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