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
7dffea0d
Commit
7dffea0d
authored
Jun 03, 2016
by
Random-Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-enable node problem detector by default
parent
cf234ab6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
node-problem-detector.yaml.in
...ddons/node-problem-detector/node-problem-detector.yaml.in
+1
-1
config-default.sh
cluster/gce/config-default.sh
+1
-1
config-test.sh
cluster/gce/config-test.sh
+1
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+7
-0
No files found.
cluster/addons/node-problem-detector/node-problem-detector.yaml.in
View file @
7dffea0d
...
@@ -32,7 +32,7 @@ spec:
...
@@ -32,7 +32,7 @@ spec:
cpu: "200m"
cpu: "200m"
memory: "100Mi"
memory: "100Mi"
requests:
requests:
cpu: "
5
0m"
cpu: "
2
0m"
memory: "20Mi"
memory: "20Mi"
volumeMounts:
volumeMounts:
- name: log
- name: log
...
...
cluster/gce/config-default.sh
View file @
7dffea0d
...
@@ -112,7 +112,7 @@ CLUSTER_REGISTRY_DISK_TYPE_GCE="${CLUSTER_REGISTRY_DISK_TYPE_GCE:-pd-standard}"
...
@@ -112,7 +112,7 @@ CLUSTER_REGISTRY_DISK_TYPE_GCE="${CLUSTER_REGISTRY_DISK_TYPE_GCE:-pd-standard}"
ENABLE_CLUSTER_UI
=
"
${
KUBE_ENABLE_CLUSTER_UI
:-
true
}
"
ENABLE_CLUSTER_UI
=
"
${
KUBE_ENABLE_CLUSTER_UI
:-
true
}
"
# Optional: Install node problem detector.
# Optional: Install node problem detector.
ENABLE_NODE_PROBLEM_DETECTOR
=
"
${
KUBE_ENABLE_NODE_PROBLEM_DETECTOR
:-
fals
e
}
"
ENABLE_NODE_PROBLEM_DETECTOR
=
"
${
KUBE_ENABLE_NODE_PROBLEM_DETECTOR
:-
tru
e
}
"
# Optional: Create autoscaler for cluster's nodes.
# Optional: Create autoscaler for cluster's nodes.
ENABLE_NODE_AUTOSCALER
=
"
${
KUBE_ENABLE_NODE_AUTOSCALER
:-
false
}
"
ENABLE_NODE_AUTOSCALER
=
"
${
KUBE_ENABLE_NODE_AUTOSCALER
:-
false
}
"
...
...
cluster/gce/config-test.sh
View file @
7dffea0d
...
@@ -126,7 +126,7 @@ CLUSTER_REGISTRY_DISK_TYPE_GCE="${CLUSTER_REGISTRY_DISK_TYPE_GCE:-pd-standard}"
...
@@ -126,7 +126,7 @@ CLUSTER_REGISTRY_DISK_TYPE_GCE="${CLUSTER_REGISTRY_DISK_TYPE_GCE:-pd-standard}"
ENABLE_CLUSTER_UI
=
"
${
KUBE_ENABLE_CLUSTER_UI
:-
true
}
"
ENABLE_CLUSTER_UI
=
"
${
KUBE_ENABLE_CLUSTER_UI
:-
true
}
"
# Optional: Install node problem detector.
# Optional: Install node problem detector.
ENABLE_NODE_PROBLEM_DETECTOR
=
"
${
KUBE_ENABLE_NODE_PROBLEM_DETECTOR
:-
fals
e
}
"
ENABLE_NODE_PROBLEM_DETECTOR
=
"
${
KUBE_ENABLE_NODE_PROBLEM_DETECTOR
:-
tru
e
}
"
# Optional: Create autoscaler for cluster's nodes.
# Optional: Create autoscaler for cluster's nodes.
ENABLE_NODE_AUTOSCALER
=
"
${
KUBE_ENABLE_NODE_AUTOSCALER
:-
false
}
"
ENABLE_NODE_AUTOSCALER
=
"
${
KUBE_ENABLE_NODE_AUTOSCALER
:-
false
}
"
...
...
cluster/gce/gci/configure-helper.sh
View file @
7dffea0d
...
@@ -741,6 +741,13 @@ function start-kube-addons {
...
@@ -741,6 +741,13 @@ function start-kube-addons {
if
[[
"
${
ENABLE_CLUSTER_UI
:-}
"
==
"true"
]]
;
then
if
[[
"
${
ENABLE_CLUSTER_UI
:-}
"
==
"true"
]]
;
then
setup-addon-manifests
"addons"
"dashboard"
setup-addon-manifests
"addons"
"dashboard"
fi
fi
if
[[
"
${
ENABLE_NODE_PROBLEM_DETECTOR
:-}
"
==
"true"
]]
;
then
setup-addon-manifests
"addons"
"node-problem-detector"
local
-r
node_problem_detector_file
=
"
${
dst_dir
}
/node-problem-detector/node-problem-detector.yaml"
mv
"
${
dst_dir
}
/node-problem-detector/node-problem-detector.yaml.in"
"
${
node_problem_detector_file
}
"
# Replace the salt configurations with variable values.
sed
-i
-e
"s@{{ *pillar
\[
'master_node'
\]
*}}@
${
MASTER_NAME
}
@g"
"
${
node_problem_detector_file
}
"
fi
if
echo
"
${
ADMISSION_CONTROL
:-}
"
|
grep
-q
"LimitRanger"
;
then
if
echo
"
${
ADMISSION_CONTROL
:-}
"
|
grep
-q
"LimitRanger"
;
then
setup-addon-manifests
"admission-controls"
"limit-range"
setup-addon-manifests
"admission-controls"
"limit-range"
fi
fi
...
...
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