Merge pull request #36386 from sjenning/fix-secret-file-mode

Automatic merge from submit-queue Avoid setting S_ISGID on files in volumes Some applications are having issues with setting the S_ISGID bit on files in volumes. We intend to do this for directories so that the group ID is inherited, but not files for which S_ISGID indicates madatory file locking https://linux.die.net/man/2/stat xref https://bugzilla.redhat.com/show_bug.cgi?id=1387306 @ncdc @derekwaynecarr @pmorie

Merge pull request #36386 from sjenning/fix-secret-file-mode
193e2ae1 · Kubernetes Submit Queue · GitHub · 6b9ce1b4 · 67f31342 · 193e2ae1
Commit 193e2ae1 authored Nov 10, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

volume_linux.go pkg/volume/volume_linux.go +5 -1

No files found.
--- a/pkg/volume/volume_linux.go
+++ b/pkg/volume/volume_linux.go
@@ -71,7 +71,11 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
 			mask = roMask
 		}

-		err = chmodRunner.Chmod(path, info.Mode()|mask|os.ModeSetgid)
+		if info.IsDir() {
+			mask |= os.ModeSetgid
+		}
+
+		err = chmodRunner.Chmod(path, info.Mode()|mask)
 		if err != nil {
 			glog.Errorf("Chmod failed on %v: %v", path, err)
 		}