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

set fsGroup by securityContext.fsGroup in azure file

Browse Source 
fix comments

fix comments

fix comments
This commit is contained in:
andyzhangx
2018-01-16 03:38:14 +00:00
parent eb3196b1b4
commit c38e7589a4
4 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/azure_file/azure_util.go
View File

@@ -29,6 +29,7 @@ import (
const (
fileMode = "file_mode"
dirMode = "dir_mode"
gid = "gid"
vers = "vers"
defaultFileMode = "0755"
defaultDirMode = "0755"
@@ -95,11 +96,12 @@ func (s *azureSvc) SetAzureCredentials(host volume.VolumeHost, nameSpace, accoun
return secretName, err
}
// check whether mountOptions contain file_mode and dir_mode, if not, append default mode
func appendDefaultMountOptions(mountOptions []string) []string {
// check whether mountOptions contain file_mode, dir_mode, vers, gid, if not, append default mode
func appendDefaultMountOptions(mountOptions []string, fsGroup *int64) []string {
fileModeFlag := false
dirModeFlag := false
versFlag := false
gidFlag := false
for _, mountOption := range mountOptions {
if strings.HasPrefix(mountOption, fileMode) {
@@ -111,6 +113,9 @@ func appendDefaultMountOptions(mountOptions []string) []string {
if strings.HasPrefix(mountOption, vers) {
versFlag = true
}
if strings.HasPrefix(mountOption, gid) {
gidFlag = true
}
}
allMountOptions := mountOptions
@@ -125,5 +130,9 @@ func appendDefaultMountOptions(mountOptions []string) []string {
if !versFlag {
allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%s", vers, defaultVers))
}
if !gidFlag && fsGroup != nil {
allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%d", gid, *fsGroup))
}
return allMountOptions
}