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
965c262a
Commit
965c262a
authored
Mar 22, 2017
by
Random-Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the master NoSchedule taint.
parent
948e3754
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
configure-helper.sh
cluster/gce/container-linux/configure-helper.sh
+0
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+0
-1
default
cluster/saltbase/salt/kubelet/default
+1
-1
No files found.
cluster/gce/container-linux/configure-helper.sh
View file @
965c262a
...
...
@@ -516,7 +516,6 @@ function start-kubelet {
if
[[
"
${
REGISTER_MASTER_KUBELET
:-
false
}
"
==
"true"
]]
;
then
flags+
=
" --api-servers=https://
${
KUBELET_APISERVER
}
"
flags+
=
" --register-schedulable=false"
flags+
=
" --register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule"
else
# Standalone mode (not widely used?)
flags+
=
" --pod-cidr=
${
MASTER_IP_RANGE
}
"
...
...
cluster/gce/gci/configure-helper.sh
View file @
965c262a
...
...
@@ -684,7 +684,6 @@ function start-kubelet {
if
[[
"
${
REGISTER_MASTER_KUBELET
:-
false
}
"
==
"true"
]]
;
then
flags+
=
" --api-servers=https://
${
KUBELET_APISERVER
}
"
flags+
=
" --register-schedulable=false"
flags+
=
" --register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule"
else
# Standalone mode (not widely used?)
flags+
=
" --pod-cidr=
${
MASTER_IP_RANGE
}
"
...
...
cluster/saltbase/salt/kubelet/default
View file @
965c262a
...
...
@@ -33,7 +33,7 @@
# running on the master.
{% if grains.kubelet_api_servers is defined -%}
{% set api_servers_with_port = "--api-servers=https://" + grains.kubelet_api_servers -%}
{% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false
--register-with-taints=node.alpha.kubernetes.io/ismaster=:NoSchedule
" -%}
{% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false" -%}
{% else -%}
{% set api_servers_with_port = "" -%}
{% endif -%}
...
...
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