Merge pull request #41756 from liggitt/debug-local-up-cluster

Automatic merge from submit-queue

Revert "first steps to adding  kubelet option to enable debugger mode, next steps is to included a warning message."

This reverts commit d3b2708ae8.

Kubelet already defaults to enabling debug handlers. I don't think we want to surface every possible option in local-up-cluster.sh
This commit is contained in:
Kubernetes Submit Queue 2017-02-20 13:02:19 -08:00 committed by GitHub
commit 8bf4a3207a

View File

@ -29,7 +29,6 @@ RUNTIME_CONFIG=${RUNTIME_CONFIG:-""}
KUBELET_AUTHORIZATION_WEBHOOK=${KUBELET_AUTHORIZATION_WEBHOOK:-""}
KUBELET_AUTHENTICATION_WEBHOOK=${KUBELET_AUTHENTICATION_WEBHOOK:-""}
POD_MANIFEST_PATH=${POD_MANIFEST_PATH:-"/var/run/kubernetes/static-pods"}
ENABLE_KUBELET_DEBUG_HANDLERS=${ENABLE_KUBELET_DEBUG_HANDLERS:-false}
# Name of the network plugin, eg: "kubenet"
NET_PLUGIN=${NET_PLUGIN:-""}
# Place the binaries required by NET_PLUGIN in this directory, eg: "/home/kubernetes/bin".
@ -593,7 +592,6 @@ function start_kubelet {
--eviction-soft=${EVICTION_SOFT} \
--eviction-pressure-transition-period=${EVICTION_PRESSURE_TRANSITION_PERIOD} \
--pod-manifest-path="${POD_MANIFEST_PATH}" \
--enable-debugging-handlers=${ENABLE_KUBELET_DEBUG_HANDLERS} \
${auth_args} \
${dns_args} \
${net_plugin_dir_args} \
@ -798,9 +796,6 @@ if [[ "${START_MODE}" != "nokubelet" ]]; then
;;
Linux)
start_kubelet
if [[ "${ENABLE_KUBELET_DEBUG_HANDLER}" = true ]]; then
warning "kubelet is debug mode."
fi
;;
*)
warning "Unsupported host OS. Must be Linux or Mac OS X, kubelet aborted."