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
e89e01d0
Commit
e89e01d0
authored
Jul 31, 2017
by
Klaus Ma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed doTaintingPass to doNoExecuteTaintingPass.
parent
678947d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
nodecontroller.go
pkg/controller/node/nodecontroller.go
+2
-2
nodecontroller_test.go
pkg/controller/node/nodecontroller_test.go
+2
-2
No files found.
pkg/controller/node/nodecontroller.go
View file @
e89e01d0
...
...
@@ -434,7 +434,7 @@ func (nc *NodeController) doEvictionPass() {
}
}
func
(
nc
*
NodeController
)
doTaintingPass
()
{
func
(
nc
*
NodeController
)
do
NoExecute
TaintingPass
()
{
nc
.
evictorLock
.
Lock
()
defer
nc
.
evictorLock
.
Unlock
()
for
k
:=
range
nc
.
zoneNoExecuteTainer
{
...
...
@@ -498,7 +498,7 @@ func (nc *NodeController) Run(stopCh <-chan struct{}) {
if
nc
.
useTaintBasedEvictions
{
// Handling taint based evictions. Because we don't want a dedicated logic in TaintManager for NC-originated
// taints and we normally don't rate limit evictions caused by taints, we need to rate limit adding taints.
go
wait
.
Until
(
nc
.
doTaintingPass
,
nodeEvictionPeriod
,
wait
.
NeverStop
)
go
wait
.
Until
(
nc
.
do
NoExecute
TaintingPass
,
nodeEvictionPeriod
,
wait
.
NeverStop
)
}
else
{
// Managing eviction of nodes:
// When we delete pods off a node, if the node was not empty at the time we then
...
...
pkg/controller/node/nodecontroller_test.go
View file @
e89e01d0
...
...
@@ -2005,7 +2005,7 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) {
if
err
:=
nodeController
.
monitorNodeStatus
();
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
}
nodeController
.
doTaintingPass
()
nodeController
.
do
NoExecute
TaintingPass
()
node0
,
err
:=
fakeNodeHandler
.
Get
(
"node0"
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
...
...
@@ -2043,7 +2043,7 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) {
if
err
:=
nodeController
.
monitorNodeStatus
();
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
}
nodeController
.
doTaintingPass
()
nodeController
.
do
NoExecute
TaintingPass
()
node0
,
err
=
fakeNodeHandler
.
Get
(
"node0"
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
...
...
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