mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Revert "Enable containerized storage plugins mounter on GCI"
This commit is contained in:
parent
e37b7cbde0
commit
765f7b9406
@ -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:
|
|||||||
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
|
|||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user