Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes-sigs/kueue
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1ad6b115a7f6bf85150dc9e38012790a7d974ed1
Choose a base ref
..
head repository: kubernetes-sigs/kueue
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a56c214829846a6298f4ab9c68f7f47919db77de
Choose a head ref
Showing with 11 additions and 12 deletions.
  1. +11 −12 pkg/controller/jobs/appwrapper/appwrapper_multikueue_adapter.go
23 changes: 11 additions & 12 deletions pkg/controller/jobs/appwrapper/appwrapper_multikueue_adapter.go
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

@@ -105,19 +106,17 @@ func (b *multikueueAdapter) KeepAdmissionCheckPending() bool {
}

func (b *multikueueAdapter) IsJobManagedByKueue(ctx context.Context, c client.Client, key types.NamespacedName) (bool, string, error) {
aw := awv1beta2.AppWrapper{}
err := c.Get(ctx, key, &aw)
if err != nil {
return false, "", err
}
awControllerName := ptr.Deref(aw.Spec.ManagedBy, "")
if awControllerName != kueue.MultiKueueControllerName {
return false, fmt.Sprintf("Expecting spec.managedBy to be %q not %q", kueue.MultiKueueControllerName, awControllerName), nil
}
return true, "", nil
/*
aw := awv1beta2.AppWrapper{}
err := c.Get(ctx, key, &aw)
if err != nil {
return false, "", err
}
awControllerName := ptr.Deref(aw.Spec.ManagedBy, "")
if awControllerName != kueue.MultiKueueControllerName {
return false, fmt.Sprintf("Expecting spec.managedBy to be %q not %q", kueue.MultiKueueControllerName, awControllerName), nil
}
return true, "", nil
*/

}

var _ jobframework.MultiKueueWatcher = (*multikueueAdapter)(nil)