github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix the job controller unit test for enforcing ActiveDeadlineSeconds

Browse Source
This commit is contained in:
Michal Wozniak 2023-01-10 09:40:56 +01:00
parent a66aad2d80
commit 7065b42bb2
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/controller/job/job_controller_test.go
View File

@ -1697,6 +1697,10 @@ func TestPastDeadlineJobFinished(t *testing.T) {
manager, sharedInformerFactory := newControllerFromClientWithClock(clientset, controller.NoResyncPeriodFunc, fakeClock) manager, sharedInformerFactory := newControllerFromClientWithClock(clientset, controller.NoResyncPeriodFunc, fakeClock)
manager.podStoreSynced = alwaysReady manager.podStoreSynced = alwaysReady
manager.jobStoreSynced = alwaysReady manager.jobStoreSynced = alwaysReady
manager.expectations = FakeJobExpectations{
controller.NewControllerExpectations(), true, func() {
},
}
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
sharedInformerFactory.Start(ctx.Done()) sharedInformerFactory.Start(ctx.Done())
@ -1737,10 +1741,6 @@ func TestPastDeadlineJobFinished(t *testing.T) {
if err := sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(job); err != nil { if err := sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(job); err != nil {
t.Fatalf("Failed to insert job in index: %v", err) t.Fatalf("Failed to insert job in index: %v", err)
} }
// This is needed because the fake clientset doesn't report created pods
// to the informer, leading to unsatisfied expectations in syncJob that prevent the controller from setting the final condition.
podIndexer := sharedInformerFactory.Core().V1().Pods().Informer().GetIndexer()
setPodsStatuses(podIndexer, job, 0, 1, 0, 0, 0)
var j *batch.Job var j *batch.Job
err = wait.PollImmediate(200*time.Microsecond, 3*time.Second, func() (done bool, err error) { err = wait.PollImmediate(200*time.Microsecond, 3*time.Second, func() (done bool, err error) {
@ -1753,25 +1753,22 @@ func TestPastDeadlineJobFinished(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Job failed to ensure that start time was set: %v", err) t.Errorf("Job failed to ensure that start time was set: %v", err)
} }
for _, c := range j.Status.Conditions {
if c.Reason == "DeadlineExceeded" {
t.Errorf("Job contains DeadlineExceeded condition earlier than expected")
break
}
}
// Make sure the start time is in the informer cache. // Make sure the start time is in the informer cache.
if err := sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(j); err != nil { if err := sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(j); err != nil {
t.Fatalf("Failed to update job in cache: %v", err) t.Fatalf("Failed to update job in cache: %v", err)
} }
manager.clock.Sleep(time.Second) err = wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
err = wait.Poll(200*time.Millisecond, 3*time.Second, func() (done bool, err error) {
j, err = clientset.BatchV1().Jobs(metav1.NamespaceDefault).Get(ctx, job.GetName(), metav1.GetOptions{}) j, err = clientset.BatchV1().Jobs(metav1.NamespaceDefault).Get(ctx, job.GetName(), metav1.GetOptions{})
if err != nil { if err != nil {
return false, nil return false, nil
} }
if len(j.Status.Conditions) == 1 && j.Status.Conditions[0].Reason == "DeadlineExceeded" { if getCondition(j, batch.JobFailed, v1.ConditionTrue, "DeadlineExceeded") {
if manager.clock.Since(j.Status.StartTime.Time) < time.Duration(*j.Spec.ActiveDeadlineSeconds)*time.Second {
return true, errors.New("Job contains DeadlineExceeded condition earlier than expected")
}
return true, nil return true, nil
} }
manager.clock.Sleep(100 * time.Millisecond)
return false, nil return false, nil
}) })
if err != nil { if err != nil {