github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Refactor node taint conditions

Browse Source
This commit is contained in:
Harry Zhang 2017-08-24 19:59:00 +08:00
parent e190f39112
commit 221db2bd6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/validation/validation_test.go
View File

@ -5004,7 +5004,7 @@ func TestValidatePod(t *testing.T) {
Name: "pod-forgiveness-invalid", Name: "pod-forgiveness-invalid",
Namespace: "ns", Namespace: "ns",
}, },
Spec: extendPodSpecwithTolerations(validPodSpec(nil), []api.Toleration{{Key: "node.alpha.kubernetes.io/notReady", Operator: "Exists", Effect: "NoExecute", TolerationSeconds: &[]int64{-2}[0]}}), Spec: extendPodSpecwithTolerations(validPodSpec(nil), []api.Toleration{{Key: "node.kubernetes.io/not-ready", Operator: "Exists", Effect: "NoExecute", TolerationSeconds: &[]int64{-2}[0]}}),
}, },
{ // docker default seccomp profile { // docker default seccomp profile
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -5562,7 +5562,7 @@ func TestValidatePod(t *testing.T) {
Name: "pod-forgiveness-invalid", Name: "pod-forgiveness-invalid",
Namespace: "ns", Namespace: "ns",
}, },
Spec: extendPodSpecwithTolerations(validPodSpec(nil), []api.Toleration{{Key: "node.alpha.kubernetes.io/notReady", Operator: "Exists", Effect: "NoSchedule", TolerationSeconds: &[]int64{20}[0]}}), Spec: extendPodSpecwithTolerations(validPodSpec(nil), []api.Toleration{{Key: "node.kubernetes.io/not-ready", Operator: "Exists", Effect: "NoSchedule", TolerationSeconds: &[]int64{20}[0]}}),
}, },
}, },
"must be a valid pod seccomp profile": { "must be a valid pod seccomp profile": {

2
plugin/pkg/scheduler/algorithm/well_known_labels.go
View File

@ -20,7 +20,7 @@ const (
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeNotReady would be automatically added by node controller // TaintNodeNotReady would be automatically added by node controller
// when node is not ready, and removed when node becomes ready. // when node is not ready, and removed when node becomes ready.
TaintNodeNotReady = "node.alpha.kubernetes.io/notReady" TaintNodeNotReady = "node.kubernetes.io/not-ready"
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeUnreachable would be automatically added by node controller // TaintNodeUnreachable would be automatically added by node controller