Commit 5ded63a6 authored by Marek Grabowski's avatar Marek Grabowski Committed by GitHub

Merge pull request #35763 from kubernetes/revert-35350-enable-gci-cmount

Revert "Enable containerized storage plugins mounter on GCI"
parents 433848c1 765f7b94
...@@ -475,10 +475,7 @@ function start-kubelet { ...@@ -475,10 +475,7 @@ 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}"
fi fi
...@@ -1167,9 +1164,6 @@ For Kubernetes copyright and licensing information, see: ...@@ -1167,9 +1164,6 @@ 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"
...@@ -1204,8 +1198,6 @@ else ...@@ -1204,8 +1198,6 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment