Skip to content

Commit

Permalink
Merge pull request kubernetes#43134 from shyamjvs/fix-configure-script
Browse files Browse the repository at this point in the history
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 kubernetes#40139 (comment)

cc @wojtek-t
  • Loading branch information
Kubernetes Submit Queue authored Mar 15, 2017
2 parents 9e81146 + 63e1c78 commit 4c5d50e
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions cluster/gce/gci/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 4c5d50e

Please sign in to comment.