Merge pull request #43134 from shyamjvs/fix-configure-script

Automatic merge from submit-queue (batch tested with PRs 40404, 43134, 43117) Add -p to mkdirs in gci-mounter function of gce configure.sh script Ref https://github.com/kubernetes/kubernetes/issues/40139#issuecomment-286068409 cc @wojtek-t

Merge pull request #43134 from shyamjvs/fix-configure-script
4c5d50e9 · Kubernetes Submit Queue · GitHub · 9e811465 · 63e1c78b · 4c5d50e9
Commit 4c5d50e9 authored Mar 15, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

configure.sh cluster/gce/gci/configure.sh +12 -12

No files found.
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -115,18 +115,18 @@ function split-commas {
 }

 function install-gci-mounter-tools {
-    CONTAINERIZED_MOUNTER_HOME="${KUBE_HOME}/containerized_mounter"
-    mkdir "${CONTAINERIZED_MOUNTER_HOME}"
-    chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
-    mkdir "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
-    local -r mounter_tar_sha="8003b798cf33c7f91320cd6ee5cec4fa22244571"
-    download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
-    cp "${dst_dir}/kubernetes/gci-trusty/gci-mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
-    chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
-    mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar
-    tar xvf /tmp/mounter.tar -C "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
-    rm /tmp/mounter.tar
-    mkdir "${CONTAINERIZED_MOUNTER_HOME}/rootfs/var/lib/kubelet"
+  CONTAINERIZED_MOUNTER_HOME="${KUBE_HOME}/containerized_mounter"
+  mkdir -p "${CONTAINERIZED_MOUNTER_HOME}"
+  chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
+  mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
+  local -r mounter_tar_sha="8003b798cf33c7f91320cd6ee5cec4fa22244571"
+  download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
+  cp "${dst_dir}/kubernetes/gci-trusty/gci-mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
+  chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
+  mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar
+  tar xvf /tmp/mounter.tar -C "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
+  rm /tmp/mounter.tar
+  mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs/var/lib/kubelet"
 }

 # Install node problem detector binary.