Skip to content
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

Add filter to pod reconciler #429

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add filter to pod reconciler #429

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
16 changes: 10 additions & 6 deletions pkg/epp/controller/pod_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ import (
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
)

type PodReconciler struct {
client.Client
Datastore datastore.Datastore
Scheme *runtime.Scheme
// namespace of the InferencePool
// we donot support cross namespace pod selection
Namespace string
Record record.EventRecorder
}

func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
logger := log.FromContext(ctx)
inferencePool, err := c.Datastore.PoolGet()
_, err := c.Datastore.PoolGet()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a PoolHasSynced that can be used instead.

if err != nil {
logger.V(logutil.TRACE).Info("Skipping reconciling Pod because the InferencePool is not available yet", "error", err)
// When the inferencePool is initialized it lists the appropriate pods and populates the datastore, so no need to requeue.
return ctrl.Result{}, nil
} else if inferencePool.Namespace != req.Namespace {
return ctrl.Result{}, nil
}

logger.V(logutil.VERBOSE).Info("Pod being reconciled", "name", req.NamespacedName)
Expand All @@ -67,8 +67,12 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
}

func (c *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
// Filter specific inference pool
p := predicate.NewPredicateFuncs(func(object client.Object) bool {
return object.GetNamespace() == c.Namespace
})
return ctrl.NewControllerManagedBy(mgr).
For(&corev1.Pod{}).
For(&corev1.Pod{}).WithEventFilter(p).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, an eventFilter is still a client side filter, a more scalable approach is to set the filter server side for the namespace, and we can do that via ByObject cache option [1], we can do that for all other objects we reconcile on as well, wdyt?

[1] https://github.com/kubernetes-sigs/controller-runtime/blob/main/designs/cache_options.md

Complete(c)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/epp/server/runserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ func (r *ExtProcServerRunner) SetupWithManager(ctx context.Context, mgr ctrl.Man

if err := (&controller.PodReconciler{
Datastore: r.Datastore,
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Namespace: r.PoolNamespace,
Record: mgr.GetEventRecorderFor("pod"),
}).SetupWithManager(mgr); err != nil {
return fmt.Errorf("failed setting up EndpointSliceReconciler: %v", err)
Expand Down