Merge pull request #35350 from vishh/enable-gci-cmount

Automatic merge from submit-queue

Enable containerized storage plugins mounter on GCI

```release-note
On GCI, kubelet uses an external mounter script (typically a special container running in a chroot) to perform mount operations
```
This commit is contained in:
Kubernetes Submit Queue 2016-10-27 19:33:13 -07:00 committed by GitHub
commit 52988de1ee

View File

@ -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
@ -1164,6 +1167,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 +1204,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