Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Enable containerized storage plugins mounter on GCI" #35763

Merged
merged 1 commit into from Oct 28, 2016
Merged

Revert "Enable containerized storage plugins mounter on GCI" #35763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions cluster/gce/gci/configure-helper.sh
View file
Open in desktop
Expand Up @@ -475,10 +475,7 @@ 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
Expand Down Expand Up @@ -1167,9 +1164,6 @@ 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"
Expand Down Expand Up @@ -1204,8 +1198,6 @@ 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
Expand Down