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

Merge pull request #123537 from kaisoz/commonize-job-util-functions

Browse Source 
Add the util pkg to commonize job util functions
This commit is contained in:
Kubernetes Prow Robot
2024-05-07 16:59:28 -07:00
committed by GitHub
parent 1308e661e0 c856c412b9
commit d2e6c51b05
9 changed files with 246 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/apps/cronjob.go
View File

@@ -39,7 +39,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/util/retry"
batchinternal "k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/controller/job"
jobutil "k8s.io/kubernetes/pkg/controller/job/util"
"k8s.io/kubernetes/test/e2e/framework"
e2ejob "k8s.io/kubernetes/test/e2e/framework/job"
e2eresource "k8s.io/kubernetes/test/e2e/framework/resource"
@@ -715,7 +715,7 @@ func waitForAnyFinishedJob(ctx context.Context, c clientset.Interface, ns string
return false, err
}
for i := range jobs.Items {
if job.IsJobFinished(&jobs.Items[i]) {
if jobutil.IsJobFinished(&jobs.Items[i]) {
return true, nil
}
}
@@ -761,7 +761,7 @@ func filterNotDeletedJobs(jobs *batchv1.JobList) []*batchv1.Job {
func filterActiveJobs(jobs *batchv1.JobList) (active []*batchv1.Job, finished []*batchv1.Job) {
for i := range jobs.Items {
j := jobs.Items[i]
if !job.IsJobFinished(&j) {
if !jobutil.IsJobFinished(&j) {
active = append(active, &j)
} else {
finished = append(finished, &j)