github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73533 from babiel/fix-fsgroup-directory-permissions 

Ensure directories are executable for fsGroup
pull/564/head
Kubernetes Prow Robot 2019-02-06 20:03:01 -08:00 committed by GitHub
parent 152b09ac55 7a9f21bbb8
commit 6fc9a72f58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/volume/volume_linux.go
View File

@ -28,8 +28,9 @@ import (
) )
const ( const (
rwMask = os.FileMode(0660) rwMask = os.FileMode(0660)
roMask = os.FileMode(0440) roMask = os.FileMode(0440)
execMask = os.FileMode(0110)
) )
// SetVolumeOwnership modifies the given volume to be owned by // SetVolumeOwnership modifies the given volume to be owned by
@ -79,6 +80,7 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
if info.IsDir() { if info.IsDir() {
mask |= os.ModeSetgid mask |= os.ModeSetgid
mask |= execMask
} }
err = os.Chmod(path, info.Mode()|mask) err = os.Chmod(path, info.Mode()|mask)