mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #79007 from wangzhen127/fix-npd-config
Clean up node-problem-detector configuration for GCI
This commit is contained in:
commit
fb1e9c0473
@ -1260,11 +1260,13 @@ function start-node-problem-detector {
|
|||||||
local -r km_config="${KUBE_HOME}/node-problem-detector/config/kernel-monitor.json"
|
local -r km_config="${KUBE_HOME}/node-problem-detector/config/kernel-monitor.json"
|
||||||
# TODO(random-liu): Handle this for alternative container runtime.
|
# TODO(random-liu): Handle this for alternative container runtime.
|
||||||
local -r dm_config="${KUBE_HOME}/node-problem-detector/config/docker-monitor.json"
|
local -r dm_config="${KUBE_HOME}/node-problem-detector/config/docker-monitor.json"
|
||||||
local -r custom_km_config="${KUBE_HOME}/node-problem-detector/config/kernel-monitor-counter.json,${KUBE_HOME}/node-problem-detector/config/systemd-monitor-counter.json,${KUBE_HOME}/node-problem-detector/config/docker-monitor-counter.json"
|
local -r custom_km_config="${KUBE_HOME}/node-problem-detector/config/kernel-monitor-counter.json"
|
||||||
|
local -r custom_dm_config="${KUBE_HOME}/node-problem-detector/config/docker-monitor-counter.json"
|
||||||
|
local -r custom_sm_config="${KUBE_HOME}/node-problem-detector/config/systemd-monitor-counter.json"
|
||||||
flags="${NPD_TEST_LOG_LEVEL:-"--v=2"} ${NPD_TEST_ARGS:-}"
|
flags="${NPD_TEST_LOG_LEVEL:-"--v=2"} ${NPD_TEST_ARGS:-}"
|
||||||
flags+=" --logtostderr"
|
flags+=" --logtostderr"
|
||||||
flags+=" --system-log-monitors=${km_config},${dm_config}"
|
flags+=" --system-log-monitors=${km_config},${dm_config}"
|
||||||
flags+=" --custom-plugin-monitors=${custom_km_config}"
|
flags+=" --custom-plugin-monitors=${custom_km_config},${custom_dm_config},${custom_sm_config}"
|
||||||
local -r npd_port=${NODE_PROBLEM_DETECTOR_PORT:-20256}
|
local -r npd_port=${NODE_PROBLEM_DETECTOR_PORT:-20256}
|
||||||
flags+=" --port=${npd_port}"
|
flags+=" --port=${npd_port}"
|
||||||
if [[ -n "${EXTRA_NPD_ARGS:-}" ]]; then
|
if [[ -n "${EXTRA_NPD_ARGS:-}" ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user