Merge pull request kubernetes#76407 from yanghaichao12/dev0411

k8s-ci-robot · web-flow · commit 0c0408c790c6 · 2019-11-05T19:30:59.000-08:00
change directory permissions from 0755 to 0750
diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go
@@ -231,7 +231,7 @@ func (m *ManagerImpl) Start(activePods ActivePodsFunc, sourcesReady config.Sourc
 	}
 
 	socketPath := filepath.Join(m.socketdir, m.socketname)
-	os.MkdirAll(m.socketdir, 0755)
+	os.MkdirAll(m.socketdir, 0750)
 	if selinux.SELinuxEnabled() {
 		if err := selinux.SetFileLabel(m.socketdir, config.KubeletPluginsDirSELinuxLabel); err != nil {
 			klog.Warningf("Unprivileged containerized plugins might not work. Could not set selinux context on %s: %v", m.socketdir, err)

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ func (m *ManagerImpl) Start(activePods ActivePodsFunc, sourcesReady config.Sourc`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`socketPath := filepath.Join(m.socketdir, m.socketname)`
`234`		`- os.MkdirAll(m.socketdir, 0755)`
	`234`	`+ os.MkdirAll(m.socketdir, 0750)`
`235`	`235`	`if selinux.SELinuxEnabled() {`
`236`	`236`	`if err := selinux.SetFileLabel(m.socketdir, config.KubeletPluginsDirSELinuxLabel); err != nil {`
`237`	`237`	`klog.Warningf("Unprivileged containerized plugins might not work. Could not set selinux context on %s: %v", m.socketdir, err)`