Commit 8bf4a320 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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 d3b2708a. Kubelet already defaults to enabling debug handlers. I don't think we want to surface every possible option in local-up-cluster.sh
parents a3c8d140 eaff7803
...@@ -29,7 +29,6 @@ RUNTIME_CONFIG=${RUNTIME_CONFIG:-""} ...@@ -29,7 +29,6 @@ RUNTIME_CONFIG=${RUNTIME_CONFIG:-""}
KUBELET_AUTHORIZATION_WEBHOOK=${KUBELET_AUTHORIZATION_WEBHOOK:-""} KUBELET_AUTHORIZATION_WEBHOOK=${KUBELET_AUTHORIZATION_WEBHOOK:-""}
KUBELET_AUTHENTICATION_WEBHOOK=${KUBELET_AUTHENTICATION_WEBHOOK:-""} KUBELET_AUTHENTICATION_WEBHOOK=${KUBELET_AUTHENTICATION_WEBHOOK:-""}
POD_MANIFEST_PATH=${POD_MANIFEST_PATH:-"/var/run/kubernetes/static-pods"} 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" # Name of the network plugin, eg: "kubenet"
NET_PLUGIN=${NET_PLUGIN:-""} NET_PLUGIN=${NET_PLUGIN:-""}
# Place the binaries required by NET_PLUGIN in this directory, eg: "/home/kubernetes/bin". # Place the binaries required by NET_PLUGIN in this directory, eg: "/home/kubernetes/bin".
...@@ -593,7 +592,6 @@ function start_kubelet { ...@@ -593,7 +592,6 @@ function start_kubelet {
--eviction-soft=${EVICTION_SOFT} \ --eviction-soft=${EVICTION_SOFT} \
--eviction-pressure-transition-period=${EVICTION_PRESSURE_TRANSITION_PERIOD} \ --eviction-pressure-transition-period=${EVICTION_PRESSURE_TRANSITION_PERIOD} \
--pod-manifest-path="${POD_MANIFEST_PATH}" \ --pod-manifest-path="${POD_MANIFEST_PATH}" \
--enable-debugging-handlers=${ENABLE_KUBELET_DEBUG_HANDLERS} \
${auth_args} \ ${auth_args} \
${dns_args} \ ${dns_args} \
${net_plugin_dir_args} \ ${net_plugin_dir_args} \
...@@ -798,9 +796,6 @@ if [[ "${START_MODE}" != "nokubelet" ]]; then ...@@ -798,9 +796,6 @@ if [[ "${START_MODE}" != "nokubelet" ]]; then
;; ;;
Linux) Linux)
start_kubelet 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." warning "Unsupported host OS. Must be Linux or Mac OS X, kubelet aborted."
......
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