github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95013 from soltysh/fix_context

Browse Source 
Use pager's context instead of TODO
This commit is contained in:
Kubernetes Prow Robot 2020-09-24 08:16:20 -07:00 committed by GitHub
commit 2d9a0b64d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/cronjob/cronjob_controller.go
View File

@ -119,20 +119,18 @@ func (jm *Controller) syncAll() {
js = append(js, *jobTmp) js = append(js, *jobTmp)
return nil return nil
}) })
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Failed to extract job list: %v", err)) utilruntime.HandleError(fmt.Errorf("Failed to extract job list: %v", err))
return return
} }
klog.V(4).Infof("Found %d jobs", len(js)) klog.V(4).Infof("Found %d jobs", len(js))
cronJobListFunc := func(opts metav1.ListOptions) (runtime.Object, error) {
return jm.kubeClient.BatchV1beta1().CronJobs(metav1.NamespaceAll).List(context.TODO(), opts)
}
jobsByCj := groupJobsByParent(js) jobsByCj := groupJobsByParent(js)
klog.V(4).Infof("Found %d groups", len(jobsByCj)) klog.V(4).Infof("Found %d groups", len(jobsByCj))
err = pager.New(pager.SimplePageFunc(cronJobListFunc)).EachListItem(context.Background(), metav1.ListOptions{}, func(object runtime.Object) error {
err = pager.New(func(ctx context.Context, opts metav1.ListOptions) (runtime.Object, error) {
return jm.kubeClient.BatchV1beta1().CronJobs(metav1.NamespaceAll).List(ctx, opts)
}).EachListItem(context.Background(), metav1.ListOptions{}, func(object runtime.Object) error {
cj, ok := object.(*batchv1beta1.CronJob) cj, ok := object.(*batchv1beta1.CronJob)
if !ok { if !ok {
return fmt.Errorf("expected type *batchv1beta1.CronJob, got type %T", cj) return fmt.Errorf("expected type *batchv1beta1.CronJob, got type %T", cj)