Merge pull request kubernetes#2132 from erikstmartin/kubelet-rootdir-fix

Fixes kubernetes#1612 kubelet should fail to start if it cannot create rootDir
duda · Nov 3, 2014 · 2d92305 · 2d92305
2 parents fd7c657 + f75f2bb
commit 2d92305
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go
@@ -141,7 +141,7 @@ func main() {
 	}
 	*rootDirectory = path.Clean(*rootDirectory)
 	if err := os.MkdirAll(*rootDirectory, 0750); err != nil {
-		glog.Warningf("Error creating root directory: %v", err)
+		glog.Fatalf("Error creating root directory: %v", err)
 	}
 
 	// source of all configuration

diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -54,6 +54,7 @@ kube::log::status "Running kubectl with no options"
 # Start kubelet
 kube::log::status "Starting kubelet"
 "${KUBE_OUTPUT_HOSTBIN}/kubelet" \
+  --root_dir=/tmp/kubelet.$$ \
   --etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
   --hostname_override="127.0.0.1" \
   --address="127.0.0.1" \