Skip to content

Reorganize jobframework package. #11217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
May 18, 2026
Merged

Reorganize jobframework package. #11217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions pkg/controller/jobframework/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ package jobframework

import (
"context"
"fmt"

"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -45,38 +43,6 @@ func ApplyDefaultForSuspend(ctx context.Context, job GenericJob, k8sClient clien
return nil
}

// WorkloadShouldBeSuspended determines whether jobObj should be default suspended on creation
func WorkloadShouldBeSuspended(ctx context.Context, jobObj client.Object, k8sClient client.Client,
manageJobsWithoutQueueName bool, managedJobsNamespaceSelector labels.Selector) (bool, error) {
// Do not default suspend a job whose ancestor is already managed by Kueue
ancestorJob, err := FindAncestorJobManagedByKueue(ctx, k8sClient, jobObj, manageJobsWithoutQueueName)
if err != nil || ancestorJob != nil {
return false, err
}

// Jobs with queue names whose parents are not managed by Kueue are default suspended
if QueueNameForObject(jobObj) != "" {
return true, nil
}

// Logic for managing jobs without queue names.
if manageJobsWithoutQueueName {
if managedJobsNamespaceSelector != nil {
// Default suspend the job if the namespace selector matches
ns := corev1.Namespace{}
err := k8sClient.Get(ctx, client.ObjectKey{Name: jobObj.GetNamespace()}, &ns)
if err != nil {
return false, fmt.Errorf("failed to get namespace: %w", err)
}
return managedJobsNamespaceSelector.Matches(labels.Set(ns.GetLabels())), nil
} else {
// Namespace filtering is disabled; unconditionally default suspend
return true, nil
}
}
return false, nil
}

func ApplyDefaultLocalQueue(jobObj client.Object, defaultQueueExist func(string) bool) {
if !defaultQueueExist(jobObj.GetNamespace()) {
return
Expand Down
Loading