github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26029 from luxas/mkdir_all

Browse Source 
kubelet: Use MkdirAll instead of Mkdir
This commit is contained in:
Alex Robinson 2016-05-27 11:40:01 -07:00
commit bd0b94efe2
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/container/os.go
View File

@ -25,7 +25,7 @@ import (
// OSInterface collects system level operations that need to be mocked out // OSInterface collects system level operations that need to be mocked out
// during tests. // during tests.
type OSInterface interface { type OSInterface interface {
Mkdir(path string, perm os.FileMode) error MkdirAll(path string, perm os.FileMode) error
Symlink(oldname string, newname string) error Symlink(oldname string, newname string) error
Stat(path string) (os.FileInfo, error) Stat(path string) (os.FileInfo, error)
Remove(path string) error Remove(path string) error
@ -40,8 +40,8 @@ type OSInterface interface {
type RealOS struct{} type RealOS struct{}
// MkDir will will call os.Mkdir to create a directory. // MkDir will will call os.Mkdir to create a directory.
func (RealOS) Mkdir(path string, perm os.FileMode) error { func (RealOS) MkdirAll(path string, perm os.FileMode) error {
return os.Mkdir(path, perm) return os.MkdirAll(path, perm)
} }
// Symlink will call os.Symlink to create a symbolic link. // Symlink will call os.Symlink to create a symbolic link.

2
pkg/kubelet/container/testing/os.go
View File

@ -41,7 +41,7 @@ func NewFakeOS() *FakeOS {
} }
// Mkdir is a fake call that just returns nil. // Mkdir is a fake call that just returns nil.
func (FakeOS) Mkdir(path string, perm os.FileMode) error { func (FakeOS) MkdirAll(path string, perm os.FileMode) error {
return nil return nil
} }

8
pkg/kubelet/kubelet.go
View File

@ -922,7 +922,7 @@ func (kl *Kubelet) initializeModules() error {
// Step 3: If the container logs directory does not exist, create it. // Step 3: If the container logs directory does not exist, create it.
if _, err := os.Stat(containerLogsDir); err != nil { if _, err := os.Stat(containerLogsDir); err != nil {
if err := kl.os.Mkdir(containerLogsDir, 0755); err != nil { if err := kl.os.MkdirAll(containerLogsDir, 0755); err != nil {
glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err) glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err)
} }
} }
@ -1710,13 +1710,13 @@ func (kl *Kubelet) killPod(pod *api.Pod, runningPod *kubecontainer.Pod, status *
// makePodDataDirs creates the dirs for the pod datas. // makePodDataDirs creates the dirs for the pod datas.
func (kl *Kubelet) makePodDataDirs(pod *api.Pod) error { func (kl *Kubelet) makePodDataDirs(pod *api.Pod) error {
uid := pod.UID uid := pod.UID
if err := os.Mkdir(kl.getPodDir(uid), 0750); err != nil && !os.IsExist(err) { if err := os.MkdirAll(kl.getPodDir(uid), 0750); err != nil && !os.IsExist(err) {
return err return err
} }
if err := os.Mkdir(kl.getPodVolumesDir(uid), 0750); err != nil && !os.IsExist(err) { if err := os.MkdirAll(kl.getPodVolumesDir(uid), 0750); err != nil && !os.IsExist(err) {
return err return err
} }
if err := os.Mkdir(kl.getPodPluginsDir(uid), 0750); err != nil && !os.IsExist(err) { if err := os.MkdirAll(kl.getPodPluginsDir(uid), 0750); err != nil && !os.IsExist(err) {
return err return err
} }
return nil return nil

2
pkg/kubelet/rkt/image.go
View File

@ -214,7 +214,7 @@ func (r *Runtime) writeDockerAuthConfig(image string, credsSlice []credentialpro
authDir := path.Join(configDir, "auth.d") authDir := path.Join(configDir, "auth.d")
if _, err := os.Stat(authDir); os.IsNotExist(err) { if _, err := os.Stat(authDir); os.IsNotExist(err) {
if err := os.Mkdir(authDir, 0600); err != nil { if err := os.MkdirAll(authDir, 0600); err != nil {
glog.Errorf("rkt: Cannot create auth dir: %v", err) glog.Errorf("rkt: Cannot create auth dir: %v", err)
return err return err
} }

2
pkg/kubelet/runonce.go
View File

@ -49,7 +49,7 @@ func (kl *Kubelet) RunOnce(updates <-chan kubetypes.PodUpdate) ([]RunPodResult,
// If the container logs directory does not exist, create it. // If the container logs directory does not exist, create it.
if _, err := os.Stat(containerLogsDir); err != nil { if _, err := os.Stat(containerLogsDir); err != nil {
if err := kl.os.Mkdir(containerLogsDir, 0755); err != nil { if err := kl.os.MkdirAll(containerLogsDir, 0755); err != nil {
glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err) glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err)
} }
} }