Merge pull request #68680 from benoitf/fix-chown

Fix chown on distributed flex volumes (like gluster)

Merge pull request #68680 from benoitf/fix-chown
c8f0af2a · k8s-ci-robot · GitHub · 40c7c837 · 6584df59 · c8f0af2a
Unverified Commit c8f0af2a authored Sep 25, 2018 by k8s-ci-robot Committed by GitHub Sep 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

driver-call.go pkg/volume/flexvolume/driver-call.go +2 -0

mounter.go pkg/volume/flexvolume/mounter.go +3 -1

No files found.
--- a/pkg/volume/flexvolume/driver-call.go
+++ b/pkg/volume/flexvolume/driver-call.go
@@ -223,6 +223,7 @@ type DriverCapabilities struct {
 	Attach          bool `json:"attach"`
 	SELinuxRelabel  bool `json:"selinuxRelabel"`
 	SupportsMetrics bool `json:"supportsMetrics"`
+	FSGroup         bool `json:"fsGroup"`
 }

 func defaultCapabilities() *DriverCapabilities {
@@ -230,6 +231,7 @@ func defaultCapabilities() *DriverCapabilities {
 		Attach:          true,
 		SELinuxRelabel:  true,
 		SupportsMetrics: false,
+		FSGroup:         true,
 	}
 }


--- a/pkg/volume/flexvolume/mounter.go
+++ b/pkg/volume/flexvolume/mounter.go
@@ -92,7 +92,9 @@ func (f *flexVolumeMounter) SetUpAt(dir string, fsGroup *int64) error {
 	}

 	if !f.readOnly {
-		volume.SetVolumeOwnership(f, fsGroup)
+		if f.plugin.capabilities.FSGroup {
+			volume.SetVolumeOwnership(f, fsGroup)
+		}
 	}

 	return nil