test source

Signed-off-by: Jooho Lee <jlee@redhat.com>

Author: Jooho

pkg/apis/serving/v1beta1/inference_service_status.go

@@ -124,6 +124,7 @@ const (
 	LatestDeploymentReady apis.ConditionType = "LatestDeploymentReady"
 	// Stopped is set when the inference service has been stopped and all related objects are deleted
 	Stopped apis.ConditionType = "Stopped"
+ 	Ready apis.ConditionType = "Ready"
 )
 
 type ModelStatus struct {

pkg/controller/v1beta1/inferenceservice/components/predictor.go

@@ -60,10 +60,11 @@ type Predictor struct {
 	inferenceServiceConfig *v1beta1.InferenceServicesConfig
 	deploymentMode         constants.DeploymentModeType
 	Log                    logr.Logger
+	ForceStopRuntime       bool
 }
 
 func NewPredictor(client client.Client, clientset kubernetes.Interface, scheme *runtime.Scheme,
-	inferenceServiceConfig *v1beta1.InferenceServicesConfig, deploymentMode constants.DeploymentModeType,
+	inferenceServiceConfig *v1beta1.InferenceServicesConfig, deploymentMode constants.DeploymentModeType, forceStopRuntime bool,
 ) Component {
 	return &Predictor{
 		client:                 client,
@@ -72,6 +73,7 @@ func NewPredictor(client client.Client, clientset kubernetes.Interface, scheme *
 		inferenceServiceConfig: inferenceServiceConfig,
 		deploymentMode:         deploymentMode,
 		Log:                    ctrl.Log.WithName("PredictorReconciler"),
+		ForceStopRuntime:       forceStopRuntime,
 	}
 }
 
@@ -185,16 +187,16 @@ func (p *Predictor) Reconcile(ctx context.Context, isvc *v1beta1.InferenceServic
 	} else {
 		var err error
 		podLabelKey = constants.RevisionLabel
+
+		// forceStopRuntime := false
+		// if val, exist := isvc.Annotations[constants.StopAnnotationKey]; exist {
+		// 	forceStopRuntime = strings.EqualFold(val, "true")
+		// }
+
 		if kstatus, err = p.reconcileKnativeDeployment(ctx, isvc, &objectMeta, &podSpec); err != nil {
 			return ctrl.Result{}, err
 		}
-
-		forceStopRuntime := "false"
-		if val, exist := isvc.Annotations[constants.StopAnnotationKey]; exist {
-			forceStopRuntime = val
-		}
-
-		if strings.EqualFold(forceStopRuntime, "true") {
+		if p.ForceStopRuntime {
 			// Exit early if we have already set the status to stopped
 			existing_stopped_condition := isvc.Status.GetCondition(v1beta1.Stopped)
 			if existing_stopped_condition != nil && existing_stopped_condition.Status == corev1.ConditionTrue {
@@ -205,6 +207,17 @@ func (p *Predictor) Reconcile(ctx context.Context, isvc *v1beta1.InferenceServic
 			p.Log.Info("Clearing ISVC status")
 			isvc.Status = v1beta1.InferenceServiceStatus{}
 
+			predictor_ready_condition := &apis.Condition{
+				Type:   v1beta1.PredictorReady,
+				Status: corev1.ConditionFalse,
+			}
+			isvc.Status.SetCondition(v1beta1.PredictorReady, predictor_ready_condition)
+
+			ingress_ready_condition := &apis.Condition{
+				Type:   v1beta1.IngressReady,
+				Status: corev1.ConditionFalse,
+			}
+			isvc.Status.SetCondition(v1beta1.IngressReady, ingress_ready_condition)
 			// Add the stopped condition
 			stopped_condition := &apis.Condition{
 				Type:   v1beta1.Stopped,
@@ -220,6 +233,7 @@ func (p *Predictor) Reconcile(ctx context.Context, isvc *v1beta1.InferenceServic
 			}
 			isvc.Status.SetCondition(v1beta1.Stopped, resume_condition)
 		}
+
 	}
 
 	statusSpec := isvc.Status.Components[v1beta1.PredictorComponent]
@@ -619,6 +633,8 @@ func (p *Predictor) reconcileKnativeDeployment(ctx context.Context, isvc *v1beta
 	if err != nil {
 		return nil, errors.Wrapf(err, "fails to reconcile predictor")
 	}
-	isvc.Status.PropagateStatus(v1beta1.PredictorComponent, kstatus)
+	if !p.ForceStopRuntime {
+		isvc.Status.PropagateStatus(v1beta1.PredictorComponent, kstatus)
+	}
 	return kstatus, nil
 }

pkg/controller/v1beta1/inferenceservice/controller.go

@@ -220,9 +220,14 @@ func (r *InferenceServiceReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return reconcile.Result{}, err
 	}
 
+	forceStopRuntime := false
+	if val, exist := isvc.Annotations[constants.StopAnnotationKey]; exist {
+		forceStopRuntime = strings.EqualFold(val, "true")
+	}
+
 	reconcilers := []components.Component{}
 	if deploymentMode != constants.ModelMeshDeployment {
-		reconcilers = append(reconcilers, components.NewPredictor(r.Client, r.Clientset, r.Scheme, isvcConfig, deploymentMode))
+		reconcilers = append(reconcilers, components.NewPredictor(r.Client, r.Clientset, r.Scheme, isvcConfig, deploymentMode, forceStopRuntime))
 	}
 	if isvc.Spec.Transformer != nil {
 		reconcilers = append(reconcilers, components.NewTransformer(r.Client, r.Clientset, r.Scheme, isvcConfig, deploymentMode))
@@ -254,8 +259,10 @@ func (r *InferenceServiceReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		if isvc.Spec.Explainer != nil {
 			componentList = append(componentList, v1beta1.ExplainerComponent)
 		}
-		isvc.Status.PropagateCrossComponentStatus(componentList, v1beta1.RoutesReady)
-		isvc.Status.PropagateCrossComponentStatus(componentList, v1beta1.LatestDeploymentReady)
+		if !forceStopRuntime {
+			isvc.Status.PropagateCrossComponentStatus(componentList, v1beta1.RoutesReady)
+			isvc.Status.PropagateCrossComponentStatus(componentList, v1beta1.LatestDeploymentReady)
+		}
 	}
 	// Reconcile ingress
 	ingressConfig, err := v1beta1.NewIngressConfig(isvcConfigMap)