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
3cf760c5
Unverified
Commit
3cf760c5
authored
Mar 13, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change TimeAdded to pointer
parent
42e2ca8c
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
9 deletions
+17
-9
markmaster_test.go
cmd/kubeadm/app/phases/markmaster/markmaster_test.go
+2
-2
types.go
pkg/api/types.go
+1
-1
daemon_controller_test.go
pkg/controller/daemon/daemon_controller_test.go
+7
-2
taint_controller_test.go
pkg/controller/node/scheduler/taint_controller_test.go
+2
-1
controller_utils.go
pkg/controller/node/util/controller_utils.go
+2
-1
types.go
staging/src/k8s.io/api/core/v1/types.go
+1
-1
taints_test.go
test/e2e/scheduling/taints_test.go
+2
-1
No files found.
cmd/kubeadm/app/phases/markmaster/markmaster_test.go
View file @
3cf760c5
...
@@ -49,7 +49,7 @@ func TestMarkMaster(t *testing.T) {
...
@@ -49,7 +49,7 @@ func TestMarkMaster(t *testing.T) {
"master label and taint missing"
,
"master label and taint missing"
,
""
,
""
,
nil
,
nil
,
"{
\"
metadata
\"
:{
\"
labels
\"
:{
\"
node-role.kubernetes.io/master
\"
:
\"\"
}},
\"
spec
\"
:{
\"
taints
\"
:[{
\"
effect
\"
:
\"
NoSchedule
\"
,
\"
key
\"
:
\"
node-role.kubernetes.io/master
\"
,
\"
timeAdded
\"
:null
}]}}"
,
"{
\"
metadata
\"
:{
\"
labels
\"
:{
\"
node-role.kubernetes.io/master
\"
:
\"\"
}},
\"
spec
\"
:{
\"
taints
\"
:[{
\"
effect
\"
:
\"
NoSchedule
\"
,
\"
key
\"
:
\"
node-role.kubernetes.io/master
\"
}]}}"
,
},
},
{
{
"master label missing"
,
"master label missing"
,
...
@@ -61,7 +61,7 @@ func TestMarkMaster(t *testing.T) {
...
@@ -61,7 +61,7 @@ func TestMarkMaster(t *testing.T) {
"master taint missing"
,
"master taint missing"
,
kubeadmconstants
.
LabelNodeRoleMaster
,
kubeadmconstants
.
LabelNodeRoleMaster
,
nil
,
nil
,
"{
\"
spec
\"
:{
\"
taints
\"
:[{
\"
effect
\"
:
\"
NoSchedule
\"
,
\"
key
\"
:
\"
node-role.kubernetes.io/master
\"
,
\"
timeAdded
\"
:null
}]}}"
,
"{
\"
spec
\"
:{
\"
taints
\"
:[{
\"
effect
\"
:
\"
NoSchedule
\"
,
\"
key
\"
:
\"
node-role.kubernetes.io/master
\"
}]}}"
,
},
},
{
{
"nothing missing"
,
"nothing missing"
,
...
...
pkg/api/types.go
View file @
3cf760c5
...
@@ -2229,7 +2229,7 @@ type Taint struct {
...
@@ -2229,7 +2229,7 @@ type Taint struct {
// TimeAdded represents the time at which the taint was added.
// TimeAdded represents the time at which the taint was added.
// It is only written for NoExecute taints.
// It is only written for NoExecute taints.
// +optional
// +optional
TimeAdded
metav1
.
Time
TimeAdded
*
metav1
.
Time
}
}
type
TaintEffect
string
type
TaintEffect
string
...
...
pkg/controller/daemon/daemon_controller_test.go
View file @
3cf760c5
...
@@ -63,17 +63,22 @@ var (
...
@@ -63,17 +63,22 @@ var (
noExecuteTaints
=
[]
v1
.
Taint
{{
Key
:
"dedicated"
,
Value
:
"user1"
,
Effect
:
"NoExecute"
}}
noExecuteTaints
=
[]
v1
.
Taint
{{
Key
:
"dedicated"
,
Value
:
"user1"
,
Effect
:
"NoExecute"
}}
)
)
func
nowPointer
()
*
metav1
.
Time
{
now
:=
metav1
.
Now
()
return
&
now
}
var
(
var
(
nodeNotReady
=
[]
v1
.
Taint
{{
nodeNotReady
=
[]
v1
.
Taint
{{
Key
:
algorithm
.
TaintNodeNotReady
,
Key
:
algorithm
.
TaintNodeNotReady
,
Effect
:
v1
.
TaintEffectNoExecute
,
Effect
:
v1
.
TaintEffectNoExecute
,
TimeAdded
:
metav1
.
Now
(),
TimeAdded
:
nowPointer
(),
}}
}}
nodeUnreachable
=
[]
v1
.
Taint
{{
nodeUnreachable
=
[]
v1
.
Taint
{{
Key
:
algorithm
.
TaintNodeUnreachable
,
Key
:
algorithm
.
TaintNodeUnreachable
,
Effect
:
v1
.
TaintEffectNoExecute
,
Effect
:
v1
.
TaintEffectNoExecute
,
TimeAdded
:
metav1
.
Now
(),
TimeAdded
:
nowPointer
(),
}}
}}
)
)
...
...
pkg/controller/node/scheduler/taint_controller_test.go
View file @
3cf760c5
...
@@ -33,11 +33,12 @@ import (
...
@@ -33,11 +33,12 @@ import (
var
timeForControllerToProgress
=
500
*
time
.
Millisecond
var
timeForControllerToProgress
=
500
*
time
.
Millisecond
func
createNoExecuteTaint
(
index
int
)
v1
.
Taint
{
func
createNoExecuteTaint
(
index
int
)
v1
.
Taint
{
now
:=
metav1
.
Now
()
return
v1
.
Taint
{
return
v1
.
Taint
{
Key
:
"testTaint"
+
fmt
.
Sprintf
(
"%v"
,
index
),
Key
:
"testTaint"
+
fmt
.
Sprintf
(
"%v"
,
index
),
Value
:
"test"
+
fmt
.
Sprintf
(
"%v"
,
index
),
Value
:
"test"
+
fmt
.
Sprintf
(
"%v"
,
index
),
Effect
:
v1
.
TaintEffectNoExecute
,
Effect
:
v1
.
TaintEffectNoExecute
,
TimeAdded
:
metav1
.
Now
()
,
TimeAdded
:
&
now
,
}
}
}
}
...
...
pkg/controller/node/util/controller_utils.go
View file @
3cf760c5
...
@@ -256,7 +256,8 @@ func RecordNodeStatusChange(recorder record.EventRecorder, node *v1.Node, newSta
...
@@ -256,7 +256,8 @@ func RecordNodeStatusChange(recorder record.EventRecorder, node *v1.Node, newSta
// otherwise.
// otherwise.
func
SwapNodeControllerTaint
(
kubeClient
clientset
.
Interface
,
taintsToAdd
,
taintsToRemove
[]
*
v1
.
Taint
,
node
*
v1
.
Node
)
bool
{
func
SwapNodeControllerTaint
(
kubeClient
clientset
.
Interface
,
taintsToAdd
,
taintsToRemove
[]
*
v1
.
Taint
,
node
*
v1
.
Node
)
bool
{
for
_
,
taintToAdd
:=
range
taintsToAdd
{
for
_
,
taintToAdd
:=
range
taintsToAdd
{
taintToAdd
.
TimeAdded
=
metav1
.
Now
()
now
:=
metav1
.
Now
()
taintToAdd
.
TimeAdded
=
&
now
}
}
err
:=
controller
.
AddOrUpdateTaintOnNode
(
kubeClient
,
node
.
Name
,
taintsToAdd
...
)
err
:=
controller
.
AddOrUpdateTaintOnNode
(
kubeClient
,
node
.
Name
,
taintsToAdd
...
)
...
...
staging/src/k8s.io/api/core/v1/types.go
View file @
3cf760c5
...
@@ -2466,7 +2466,7 @@ type Taint struct {
...
@@ -2466,7 +2466,7 @@ type Taint struct {
// TimeAdded represents the time at which the taint was added.
// TimeAdded represents the time at which the taint was added.
// It is only written for NoExecute taints.
// It is only written for NoExecute taints.
// +optional
// +optional
TimeAdded
metav1
.
Time
`json:"timeAdded,omitempty" protobuf:"bytes,4,opt,name=timeAdded"`
TimeAdded
*
metav1
.
Time
`json:"timeAdded,omitempty" protobuf:"bytes,4,opt,name=timeAdded"`
}
}
type
TaintEffect
string
type
TaintEffect
string
...
...
test/e2e/scheduling/taints_test.go
View file @
3cf760c5
...
@@ -36,11 +36,12 @@ import (
...
@@ -36,11 +36,12 @@ import (
)
)
func
getTestTaint
()
v1
.
Taint
{
func
getTestTaint
()
v1
.
Taint
{
now
:=
metav1
.
Now
()
return
v1
.
Taint
{
return
v1
.
Taint
{
Key
:
"kubernetes.io/e2e-evict-taint-key"
,
Key
:
"kubernetes.io/e2e-evict-taint-key"
,
Value
:
"evictTaintVal"
,
Value
:
"evictTaintVal"
,
Effect
:
v1
.
TaintEffectNoExecute
,
Effect
:
v1
.
TaintEffectNoExecute
,
TimeAdded
:
metav1
.
Now
()
,
TimeAdded
:
&
now
,
}
}
}
}
...
...
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