github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/gce/gci/configure-helper.sh
View File

@ -475,6 +475,9 @@ function start-kubelet {
flags+=" --config=/etc/kubernetes/manifests" flags+=" --config=/etc/kubernetes/manifests"
flags+=" --kubelet-cgroups=/kubelet" flags+=" --kubelet-cgroups=/kubelet"
flags+=" --system-cgroups=/system" 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 if [[ -n "${KUBELET_PORT:-}" ]]; then
flags+=" --port=${KUBELET_PORT}" flags+=" --port=${KUBELET_PORT}"
@ -1164,6 +1167,9 @@ For Kubernetes copyright and licensing information, see:
EOF EOF
} }
function pre-warm-mounter {
${KUBE_HOME}/bin/mounter &> /dev/null
}
########### Main Function ########### ########### Main Function ###########
echo "Start to configure instance for kubernetes" echo "Start to configure instance for kubernetes"
@ -1198,6 +1204,8 @@ else
create-kubeproxy-kubeconfig create-kubeproxy-kubeconfig
fi fi
# Run the containerized mounter once to pre-cache the container image.
pre-warm-mounter
assemble-docker-flags assemble-docker-flags
load-docker-images load-docker-images
start-kubelet start-kubelet