Merge pull request #26612 from andyzheng0831/gci-fix

Automatic merge from submit-queue GCI: cherry-pick the fix in PR #25670 This PR simply copies the fix in #25670 into the GCI support. cc/ @kubernetes/goog-image @dchen1107 @roberthbailey

Merge pull request #26612 from andyzheng0831/gci-fix
cb91816f · k8s-merge-robot · 0c0478e3 · a47d0ce1 · cb91816f
Commit cb91816f authored Jun 01, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

helper.sh cluster/gce/gci/helper.sh +2 -1

No files found.
--- a/cluster/gce/gci/helper.sh
+++ b/cluster/gce/gci/helper.sh
@@ -77,5 +77,6 @@ function create-master-instance {
    --can-ip-forward \
    --metadata-from-file \
      "kube-env=${KUBE_TEMP}/master-kube-env.yaml,user-data=${KUBE_ROOT}/cluster/gce/gci/master.yaml,configure-sh=${KUBE_ROOT}/cluster/gce/gci/configure.sh,cluster-name=${KUBE_TEMP}/cluster-name.txt,gci-update-strategy=${KUBE_TEMP}/gci-update.txt,gci-ensure-gke-docker=${KUBE_TEMP}/gci-docker.txt" \
-    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
+    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no" \
+    --boot-disk-size "${MASTER_ROOT_DISK_SIZE:-10}"
 }