From 64c1fa35943e1e48ff950d094e5cc45d97dfbb82 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Fri, 21 Oct 2016 17:56:12 -0700 Subject: [PATCH 1/2] run the gci containerized mounter to cache mounter container image Signed-off-by: Vishnu kannan --- cluster/gce/gci/configure-helper.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index e06b5e6183a..392c1a7a710 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1164,6 +1164,9 @@ For Kubernetes copyright and licensing information, see: EOF } +function pre-warm-mounter { + ${KUBE_HOME}/bin/mounter &> /dev/null +} ########### Main Function ########### echo "Start to configure instance for kubernetes" @@ -1198,6 +1201,8 @@ else create-kubeproxy-kubeconfig fi +# Run the containerized mounter once to pre-cache the container image. +pre-warm-mounter assemble-docker-flags load-docker-images start-kubelet From aceddfa7fcb06fa080761fa26dc4cda0feddf2ec Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Fri, 21 Oct 2016 17:43:16 -0700 Subject: [PATCH 2/2] Enable containerized storage mounter on GCI Signed-off-by: Vishnu kannan --- cluster/gce/gci/configure-helper.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 392c1a7a710..abd58092aa0 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -475,7 +475,10 @@ function start-kubelet { flags+=" --config=/etc/kubernetes/manifests" flags+=" --kubelet-cgroups=/kubelet" flags+=" --system-cgroups=/system" - + flags+=" --experimental-mounter-path=${KUBE_HOME}/bin/mounter" + # Note: This patch must match the rootfs path in mounter/mounter + flags+=" --experimental-mounter-rootfs-path=/media/root" + if [[ -n "${KUBELET_PORT:-}" ]]; then flags+=" --port=${KUBELET_PORT}" fi