Playground should be triggered to create Services and then Pods once the model is created

Author: carlory

pkg/controller/inference/playground_controller.go

@@ -119,6 +119,34 @@ func (r *PlaygroundReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *PlaygroundReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	mapFn := func(ctx context.Context, obj client.Object) []ctrl.Request {
+		logger := log.FromContext(ctx)
+
+		namespace := obj.GetNamespace()
+		name := obj.GetName()
+
+		playgrounds := &inferenceapi.PlaygroundList{}
+		err := r.List(ctx, playgrounds, client.InNamespace(namespace))
+		if err != nil {
+			logger.Error(err, "failed to list playgrounds")
+			return nil
+		}
+
+		var reqs []ctrl.Request
+		for _, playground := range playgrounds.Items {
+			if playground.Spec.ModelClaim != nil && playground.Spec.ModelClaim.ModelName == coreapi.ModelName(name) {
+				reqs = append(reqs, ctrl.Request{
+					NamespacedName: types.NamespacedName{
+						Namespace: namespace,
+						Name:      playground.Name,
+					},
+				})
+			}
+			// TODO: handle MultiModelsClaims in the future.
+		}
+		return reqs
+	}
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&inferenceapi.Playground{}).
 		Watches(&inferenceapi.Service{}, &handler.EnqueueRequestForObject{},
@@ -129,6 +157,12 @@ func (r *PlaygroundReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					return !reflect.DeepEqual(oldBar.Status, newBar.Status)
 				},
 			})).
+		Watches(&coreapi.OpenModel{}, handler.EnqueueRequestsFromMapFunc(mapFn),
+			builder.WithPredicates(predicate.Funcs{
+				UpdateFunc:  func(e event.UpdateEvent) bool { return false },
+				DeleteFunc:  func(e event.DeleteEvent) bool { return false },
+				GenericFunc: func(e event.GenericEvent) bool { return false },
+			})).
 		Complete(r)
 }
 

test/integration/controller/inference/playground_test.go

@@ -18,10 +18,12 @@ package inference
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
@@ -155,5 +157,53 @@ var _ = ginkgo.Describe("playground controller test", func() {
 				},
 			},
 		}),
+		ginkgo.Entry("create the model after playground is created", &testValidatingCase{
+			makePlayground: func() *inferenceapi.Playground {
+				return util.MockASamplePlayground(ns.Name)
+			},
+			updates: []*update{
+				{
+					playgroundUpdateFn: func(playground *inferenceapi.Playground) {
+						// Delete the pre-provision model before creating playground.
+						gomega.Expect(k8sClient.Delete(ctx, model)).To(gomega.Succeed())
+						// To make sure model not exists.
+						gomega.Eventually(func() error {
+							oldModel := &coreapi.OpenModel{}
+							if err := k8sClient.Get(ctx, types.NamespacedName{Name: model.Name, Namespace: model.Namespace}, oldModel); err != nil {
+								if apierrors.IsNotFound(err) {
+									return nil
+								}
+								return err
+							}
+							return fmt.Errorf("model %s/%s still exists", model.Namespace, model.Name)
+						}, util.IntegrationTimeout, util.Interval).Should(gomega.Succeed())
+
+						gomega.Expect(k8sClient.Create(ctx, playground)).To(gomega.Succeed())
+					},
+					checkPlayground: func(ctx context.Context, k8sClient client.Client, playground *inferenceapi.Playground) {
+						validation.ValidatePlayground(ctx, k8sClient, playground)
+						gomega.Consistently(func() error {
+							updatePlayground := inferenceapi.Playground{}
+							if err := k8sClient.Get(ctx, types.NamespacedName{Name: playground.Name, Namespace: playground.Namespace}, &updatePlayground); err != nil {
+								return err
+							}
+							if len(updatePlayground.Status.Conditions) != 0 {
+								return fmt.Errorf("playground status conditions should be empty, got %v", updatePlayground.Status.Conditions)
+							}
+							return nil
+						}, 3*util.Interval, util.Interval).Should(gomega.Succeed())
+					},
+				},
+				{
+					// create the model after playground is created.
+					playgroundUpdateFn: func(_ *inferenceapi.Playground) {
+						gomega.Expect(k8sClient.Create(ctx, model)).To(gomega.Succeed())
+					},
+					checkPlayground: func(ctx context.Context, k8sClient client.Client, playground *inferenceapi.Playground) {
+						validation.ValidatePlaygroundStatusEqualTo(ctx, k8sClient, playground, inferenceapi.PlaygroundAvailable, "PlaygroundReady", metav1.ConditionTrue)
+					},
+				},
+			},
+		}),
 	)
 })