From 2022c44409b029955feaa8e4710d811aa7d8344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?=
 <lucas.kaldstrom@hotmail.co.uk>
Date: Sun, 22 May 2016 00:23:18 +0300
Subject: [PATCH] kubelet: Use MkdirAll instead of Mkdir

---
 pkg/kubelet/container/os.go         | 6 +++---
 pkg/kubelet/container/testing/os.go | 2 +-
 pkg/kubelet/kubelet.go              | 8 ++++----
 pkg/kubelet/rkt/image.go            | 2 +-
 pkg/kubelet/runonce.go              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/kubelet/container/os.go b/pkg/kubelet/container/os.go
index b9f7e0e6632..21c0264e2af 100644
--- a/pkg/kubelet/container/os.go
+++ b/pkg/kubelet/container/os.go
@@ -25,7 +25,7 @@ import (
 // OSInterface collects system level operations that need to be mocked out
 // during tests.
 type OSInterface interface {
-	Mkdir(path string, perm os.FileMode) error
+	MkdirAll(path string, perm os.FileMode) error
 	Symlink(oldname string, newname string) error
 	Stat(path string) (os.FileInfo, error)
 	Remove(path string) error
@@ -40,8 +40,8 @@ type OSInterface interface {
 type RealOS struct{}
 
 // MkDir will will call os.Mkdir to create a directory.
-func (RealOS) Mkdir(path string, perm os.FileMode) error {
-	return os.Mkdir(path, perm)
+func (RealOS) MkdirAll(path string, perm os.FileMode) error {
+	return os.MkdirAll(path, perm)
 }
 
 // Symlink will call os.Symlink to create a symbolic link.
diff --git a/pkg/kubelet/container/testing/os.go b/pkg/kubelet/container/testing/os.go
index 0a366a9f790..f926661944e 100644
--- a/pkg/kubelet/container/testing/os.go
+++ b/pkg/kubelet/container/testing/os.go
@@ -41,7 +41,7 @@ func NewFakeOS() *FakeOS {
 }
 
 // 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
 }
 
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index b7810e1f007..ff3d1d0549d 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -915,7 +915,7 @@ func (kl *Kubelet) initializeModules() error {
 
 	// Step 3: If the container logs directory does not exist, create it.
 	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)
 		}
 	}
@@ -1688,13 +1688,13 @@ func (kl *Kubelet) killPod(pod *api.Pod, runningPod *kubecontainer.Pod, status *
 // makePodDataDirs creates the dirs for the pod datas.
 func (kl *Kubelet) makePodDataDirs(pod *api.Pod) error {
 	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
 	}
-	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
 	}
-	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 nil
diff --git a/pkg/kubelet/rkt/image.go b/pkg/kubelet/rkt/image.go
index 3e4166aff74..3515b073ad3 100644
--- a/pkg/kubelet/rkt/image.go
+++ b/pkg/kubelet/rkt/image.go
@@ -214,7 +214,7 @@ func (r *Runtime) writeDockerAuthConfig(image string, credsSlice []credentialpro
 
 	authDir := path.Join(configDir, "auth.d")
 	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)
 			return err
 		}
diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go
index 2e14d02c6d1..bf7ee7fcc57 100644
--- a/pkg/kubelet/runonce.go
+++ b/pkg/kubelet/runonce.go
@@ -49,7 +49,7 @@ func (kl *Kubelet) RunOnce(updates <-chan kubetypes.PodUpdate) ([]RunPodResult,
 
 	// If the container logs directory does not exist, create it.
 	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)
 		}
 	}