github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45251 from gyliu513/taint-typo

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41563, 45251, 46265, 46462, 46721)

Toleration should be `notReady:NoExecute` in defaulttolerationseconds…

… test.



**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-02 19:53:38 -07:00 committed by GitHub
commit 284132ee88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/admission/defaulttolerationseconds/admission_test.go
View File

@ -39,7 +39,7 @@ func TestForgivenessAdmission(t *testing.T) {
expectedPod api.Pod expectedPod api.Pod
}{ }{
{ {
description: "pod has no tolerations, expect add tolerations for `notread:NoExecute` and `unreachable:NoExecute`", description: "pod has no tolerations, expect add tolerations for `notReady:NoExecute` and `unreachable:NoExecute`",
requestedPod: api.Pod{ requestedPod: api.Pod{
Spec: api.PodSpec{}, Spec: api.PodSpec{},
}, },
@ -63,7 +63,7 @@ func TestForgivenessAdmission(t *testing.T) {
}, },
}, },
{ {
description: "pod has tolerations, but none is for taint `notread:NoExecute` or `unreachable:NoExecute`, expect add tolerations for `notread:NoExecute` and `unreachable:NoExecute`", description: "pod has tolerations, but none is for taint `notReady:NoExecute` or `unreachable:NoExecute`, expect add tolerations for `notReady:NoExecute` and `unreachable:NoExecute`",
requestedPod: api.Pod{ requestedPod: api.Pod{
Spec: api.PodSpec{ Spec: api.PodSpec{
Tolerations: []api.Toleration{ Tolerations: []api.Toleration{
@ -170,7 +170,7 @@ func TestForgivenessAdmission(t *testing.T) {
}, },
}, },
{ {
description: "pod specified tolerations for both `notread:NoExecute` and `unreachable:NoExecute`, expect no change", description: "pod specified tolerations for both `notReady:NoExecute` and `unreachable:NoExecute`, expect no change",
requestedPod: api.Pod{ requestedPod: api.Pod{
Spec: api.PodSpec{ Spec: api.PodSpec{
Tolerations: []api.Toleration{ Tolerations: []api.Toleration{