github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69451 from justinsb/sort_bind_options

Browse Source 
Sort bind options in JoinMountOptions
This commit is contained in:
k8s-ci-robot 2018-10-06 21:29:51 -07:00 committed by GitHub
commit a29b093a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/awsebs/aws_ebs_test.go
View File

@ -371,7 +371,7 @@ func TestMountOptions(t *testing.T) {
t.Errorf("Expected success, got: %v", err) t.Errorf("Expected success, got: %v", err)
} }
mountOptions := fakeMounter.MountPoints[0].Opts mountOptions := fakeMounter.MountPoints[0].Opts
expectedMountOptions := []string{"bind", "_netdev"} expectedMountOptions := []string{"_netdev", "bind"}
if !reflect.DeepEqual(mountOptions, expectedMountOptions) { if !reflect.DeepEqual(mountOptions, expectedMountOptions) {
t.Errorf("Expected mount options to be %v got %v", expectedMountOptions, mountOptions) t.Errorf("Expected mount options to be %v got %v", expectedMountOptions, mountOptions)
} }

2
pkg/volume/util/util.go
View File

@ -766,7 +766,7 @@ func JoinMountOptions(userOptions []string, systemOptions []string) []string {
for _, mountOption := range systemOptions { for _, mountOption := range systemOptions {
allMountOptions.Insert(mountOption) allMountOptions.Insert(mountOption)
} }
return allMountOptions.UnsortedList() return allMountOptions.List()
} }
// ValidateZone returns: // ValidateZone returns: