Skip to content

Fix kueue updates and improve reconciler #63

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

Open
tkatila wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix kueue updates and improve reconciler #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb89d56
misc: kueue: cleanup stale kueues
tkatila Jul 21, 2026
a8e9284
misc: kueue: use apireader to list localqueues
tkatila Jul 21, 2026
679599b
controller: get crd names once
tkatila Jul 21, 2026
46e1a99
dep: update x/text to 0.39.0
tkatila Jul 21, 2026
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ require (
golang.org/x/sync v0.21.0 // indirect
golang.org/x/sys v0.46.0 // indirect
golang.org/x/term v0.44.0 // indirect
golang.org/x/text v0.38.0 // indirect
golang.org/x/text v0.39.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.46.0 // indirect
golang.org/x/tools v0.47.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk=
golang.org/x/tools v0.46.0/go.mod h1:FrD85F8l+NWL+9XWBSyVSHO6Ne4jutsfIFba7AWQ5Ys=
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
Expand Down
37 changes: 34 additions & 3 deletions internal/controller/clusterpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
apps "k8s.io/api/apps/v1"
core "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
Expand All @@ -45,8 +46,9 @@ import (
// ClusterPolicyReconciler reconciles a ClusterPolicy object
type ClusterPolicyReconciler struct {
client.Client
Scheme *runtime.Scheme
Opts ControllerOpts
APIReader client.Reader
Scheme *runtime.Scheme
Opts ControllerOpts
}

type ControllerOpts struct {
Expand Down Expand Up @@ -156,6 +158,12 @@ func (r *ClusterPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reques
}
}()

crdNames, err := r.retrieveCRDNameList(ctx)
if err != nil {
klog.Error(err, "unable to retrieve CRD name list")
return ctrl.Result{}, err
}

// Create a local copy of the options, in case we ever have parallel reconciles with
// different request names.
opts := r.Opts
Expand All @@ -168,7 +176,7 @@ func (r *ClusterPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reques
subControllers = append(subControllers, &XpuManagerReconciler{Client: r.Client, Scheme: r.Scheme, Opts: opts})
// Include DRA subcontroller even though cluster might not be configured to use DRA, so it can report a status correctly.
subControllers = append(subControllers, &DRAReconciler{Client: r.Client, Scheme: r.Scheme, Opts: opts})
subControllers = append(subControllers, &MiscReconciler{Client: r.Client, Scheme: r.Scheme, Opts: opts})
subControllers = append(subControllers, &MiscReconciler{Client: r.Client, APIReader: r.APIReader, Scheme: r.Scheme, Opts: opts, CrdNames: crdNames})

// Ensure finalizer is present on live (non-deleted) ClusterPolicy objects.
if cp != nil && cp.DeletionTimestamp.IsZero() {
Expand Down Expand Up @@ -239,6 +247,28 @@ func (r *ClusterPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reques
return ctrl.Result{}, retErr
}

// retrieveCRDNameList returns a list of all CRD names in the cluster, to be used
// by the sub-reconcilers to determine which resources are available for use. This avoids
// retrieving the CRD list multiple times during a single reconcile.
func (r *ClusterPolicyReconciler) retrieveCRDNameList(ctx context.Context) ([]string, error) {
crdList := &unstructured.UnstructuredList{}
crdList.SetKind("CustomResourceDefinition")
crdList.SetAPIVersion("apiextensions.k8s.io/v1")

if err := r.List(ctx, crdList); err != nil {
klog.Error(err, "unable to list CRDs")

return nil, err
}

crdNames := []string{}
for _, crd := range crdList.Items {
crdNames = append(crdNames, crd.GetName())
}

return crdNames, nil
}

// draPodToClusterPolicy maps any DRA pod event to reconcile requests for all existing
// ClusterPolicy objects. This avoids relying on r.Opts.ReqName (startup config) as a
// source of truth — instead it queries the actual state of the cluster.
Expand Down Expand Up @@ -308,6 +338,7 @@ func draPodReadinessPredicate() predicate.Predicate {
// SetupWithManager sets up the controller with the Manager.
func (r *ClusterPolicyReconciler) SetupWithManager(mgr ctrl.Manager, opts ControllerOpts) error {
r.Opts = opts
r.APIReader = mgr.GetAPIReader()

b := ctrl.NewControllerManagedBy(mgr).
For(&v1alpha.ClusterPolicy{}).
Expand Down
Loading