github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61913 from jennybuckley/watch-pod-deadline

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove ActiveDeadlineSeconds from Watch e2e Test

**What this PR does / why we need it**:
I originally updated ActiveDeadlineSeconds because it is one of the few fields on Pods which can change, but I didn't consider how it might affect the reliability of the test. This PR replaces the update done to ActiveDeadlineSeconds with a more predictable update to a label.

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

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-10 10:50:19 -07:00 committed by GitHub
commit bed4531131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/apimachinery/watch.go
View File

@ -64,7 +64,6 @@ var _ = SIGDescribe("Watchers", func() {
},
},
Spec: v1.PodSpec{
ActiveDeadlineSeconds: int64ptr(20),
Containers: []v1.Container{
{
Name: "example",
@ -81,7 +80,6 @@ var _ = SIGDescribe("Watchers", func() {
},
},
Spec: v1.PodSpec{
ActiveDeadlineSeconds: int64ptr(20),
Containers: []v1.Container{
{
Name: "example",
@ -97,7 +95,7 @@ var _ = SIGDescribe("Watchers", func() {
expectNoEvent(watchB, watch.Added, testPodA)
testPodA, err = updatePod(f, testPodA.GetName(), func(p *v1.Pod) {
p.Spec.ActiveDeadlineSeconds = int64ptr(10)
p.ObjectMeta.Labels["mutation"] = "1"
})
Expect(err).NotTo(HaveOccurred())
expectEvent(watchA, watch.Modified, testPodA)
@ -105,7 +103,7 @@ var _ = SIGDescribe("Watchers", func() {
expectNoEvent(watchB, watch.Modified, testPodA)
testPodA, err = updatePod(f, testPodA.GetName(), func(p *v1.Pod) {
p.Spec.ActiveDeadlineSeconds = int64ptr(5)
p.ObjectMeta.Labels["mutation"] = "2"
})
Expect(err).NotTo(HaveOccurred())
expectEvent(watchA, watch.Modified, testPodA)