Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c8758a77
Commit
c8758a77
authored
Jun 25, 2018
by
David Ashpole
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update NPD version to v0.5.0 for gci
parent
67e7d4c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+5
-0
configure.sh
cluster/gce/gci/configure.sh
+2
-2
No files found.
cluster/gce/gci/configure-helper.sh
View file @
c8758a77
...
@@ -1181,13 +1181,18 @@ function start-node-problem-detector {
...
@@ -1181,13 +1181,18 @@ 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"
echo
"Using node problem detector binary at
${
npd_bin
}
"
echo
"Using node problem detector binary at
${
npd_bin
}
"
local
flags
=
"
${
NPD_TEST_LOG_LEVEL
:-
"--v=2"
}
${
NPD_TEST_ARGS
:-}
"
local
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+
=
" --apiserver-override=https://
${
KUBERNETES_MASTER_NAME
}
?inClusterConfig=false&auth=/var/lib/node-problem-detector/kubeconfig"
flags+
=
" --apiserver-override=https://
${
KUBERNETES_MASTER_NAME
}
?inClusterConfig=false&auth=/var/lib/node-problem-detector/kubeconfig"
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
flags+
=
"
${
EXTRA_NPD_ARGS
}
"
fi
# Write the systemd service file for node problem detector.
# Write the systemd service file for node problem detector.
cat
<<
EOF
>/etc/systemd/system/node-problem-detector.service
cat
<<
EOF
>/etc/systemd/system/node-problem-detector.service
...
...
cluster/gce/gci/configure.sh
View file @
c8758a77
...
@@ -26,8 +26,8 @@ set -o pipefail
...
@@ -26,8 +26,8 @@ set -o pipefail
### Hardcoded constants
### Hardcoded constants
DEFAULT_CNI_VERSION
=
"v0.6.0"
DEFAULT_CNI_VERSION
=
"v0.6.0"
DEFAULT_CNI_SHA1
=
"d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
DEFAULT_CNI_SHA1
=
"d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
DEFAULT_NPD_VERSION
=
"v0.
4.1
"
DEFAULT_NPD_VERSION
=
"v0.
5.0
"
DEFAULT_NPD_SHA1
=
"
a57a3fe64cab8a18ec654f5cef0aec59dae62568
"
DEFAULT_NPD_SHA1
=
"
650ecfb2ae495175ee43706d0bd862a1ea7f1395
"
DEFAULT_CRICTL_VERSION
=
"v1.11.0"
DEFAULT_CRICTL_VERSION
=
"v1.11.0"
DEFAULT_CRICTL_SHA1
=
"8f5142b985d314cdebb51afd55054d5ec00c442a"
DEFAULT_CRICTL_SHA1
=
"8f5142b985d314cdebb51afd55054d5ec00c442a"
DEFAULT_MOUNTER_TAR_SHA
=
"8003b798cf33c7f91320cd6ee5cec4fa22244571"
DEFAULT_MOUNTER_TAR_SHA
=
"8003b798cf33c7f91320cd6ee5cec4fa22244571"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment