Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions pkg/controller/v1beta1/inferenceservice/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ func (r *InferenceServiceReconciler) Reconcile(ctx context.Context, req ctrl.Req
isvc.Status.Components = make(map[v1beta1.ComponentType]v1beta1.ComponentStatusSpec)
}

// Seed top-level conditions as Unknown on first observation
if isvc.Status.GetCondition(v1beta1.EngineReady) == nil {
isvc.Status.InitializeConditions()
}

// Setup reconcilers
r.Log.Info("Reconciling inference service", "apiVersion", isvc.APIVersion, "namespace", isvc.Namespace, "isvc", isvc.Name)
isvcConfig, err := controllerconfig.NewInferenceServicesConfig(r.Clientset)
Expand Down
60 changes: 37 additions & 23 deletions pkg/controller/v1beta1/inferenceservice/status/status_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,40 +43,53 @@ func (sr *StatusReconciler) getFirstDeployment(deployments []*appsv1.Deployment)
return deployments[0], nil
}

// getDeploymentCondition extracts condition from deployment
// getDeploymentCondition extracts condition from deployment.
func (sr *StatusReconciler) getDeploymentCondition(deployment *appsv1.Deployment, conditionType appsv1.DeploymentConditionType) *apis.Condition {
condition := apis.Condition{}
for _, con := range deployment.Status.Conditions {
if con.Type == conditionType {
condition.Type = apis.ConditionType(conditionType)
condition.Status = con.Status
condition.Message = con.Message
condition.LastTransitionTime = apis.VolatileTime{
Inner: con.LastTransitionTime,
return &apis.Condition{
Type: apis.ConditionType(conditionType),
Status: con.Status,
Message: con.Message,
LastTransitionTime: apis.VolatileTime{
Inner: con.LastTransitionTime,
},
Reason: con.Reason,
}
condition.Reason = con.Reason
break
}
}
return &condition
return &apis.Condition{
Type: apis.ConditionType(conditionType),
Status: v1.ConditionUnknown,
Reason: "DeploymentConditionMissing",
Message: fmt.Sprintf("%s condition is not yet available on the deployment", conditionType),
}
}

// getLWSConditions extracts condition from LeaderWorkerSet
// getLWSConditions extracts condition from LeaderWorkerSet.
// When the requested condition type is not yet present, the function returns
// an explicit Unknown condition so that callers never receive a zero-value
// struct that silently falls through SetCondition.
func (sr *StatusReconciler) getLWSConditions(lws *lwsspec.LeaderWorkerSet, conditionType lwsspec.LeaderWorkerSetConditionType) *apis.Condition {
condition := apis.Condition{}
for _, con := range lws.Status.Conditions {
if lwsspec.LeaderWorkerSetConditionType(con.Type) == conditionType {
condition.Type = apis.ConditionType(conditionType)
condition.Status = v1.ConditionStatus(con.Status)
condition.Message = con.Message
condition.LastTransitionTime = apis.VolatileTime{
Inner: con.LastTransitionTime,
return &apis.Condition{
Type: apis.ConditionType(conditionType),
Status: v1.ConditionStatus(con.Status),
Message: con.Message,
LastTransitionTime: apis.VolatileTime{
Inner: con.LastTransitionTime,
},
Reason: con.Reason,
}
condition.Reason = con.Reason
break
}
}
return &condition
return &apis.Condition{
Type: apis.ConditionType(conditionType),
Status: v1.ConditionUnknown,
Reason: "LWSConditionMissing",
Message: fmt.Sprintf("%s condition is not yet available on the LeaderWorkerSet", conditionType),
}
}

// getMultiDeploymentCondition checks conditions across multiple deployments
Expand Down Expand Up @@ -141,11 +154,12 @@ func (sr *StatusReconciler) setCondition(status *v1beta1.InferenceServiceStatus,
func (sr *StatusReconciler) InitializeComponentCondition(status *v1beta1.InferenceServiceStatus, component v1beta1.ComponentType) {
readyCondition := sr.getReadyConditionsMap()[component]

// Only initialize if the condition doesn't exist yet
if !status.IsConditionReady(readyCondition) && !status.IsConditionUnknown(readyCondition) {
// Only initialize if the condition doesn't exist yet.
// A nil condition means the status has never been set for this component;
if status.GetCondition(readyCondition) == nil {
condition := &apis.Condition{
Type: readyCondition,
Status: v1.ConditionFalse,
Status: v1.ConditionUnknown,
Reason: "Initializing",
Message: fmt.Sprintf("%s component initializing", component),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func TestGetDeploymentCondition(t *testing.T) {
},
},
{
name: "deployment without requested condition",
name: "deployment without requested condition returns Unknown",
deployment: &appsv1.Deployment{
Status: appsv1.DeploymentStatus{
Conditions: []appsv1.DeploymentCondition{
Expand All @@ -265,7 +265,10 @@ func TestGetDeploymentCondition(t *testing.T) {
},
conditionType: appsv1.DeploymentAvailable,
expected: &apis.Condition{
Type: "",
Type: apis.ConditionType(appsv1.DeploymentAvailable),
Status: corev1.ConditionUnknown,
Reason: "DeploymentConditionMissing",
Message: "Available condition is not yet available on the deployment",
},
},
}
Expand Down Expand Up @@ -335,7 +338,7 @@ func TestGetLWSConditions(t *testing.T) {
},
},
{
name: "LWS without requested condition",
name: "LWS without requested condition returns Unknown",
lws: &lwsspec.LeaderWorkerSet{
Status: lwsspec.LeaderWorkerSetStatus{
Conditions: []metav1.Condition{
Expand All @@ -348,7 +351,10 @@ func TestGetLWSConditions(t *testing.T) {
},
conditionType: lwsspec.LeaderWorkerSetAvailable,
expected: &apis.Condition{
Type: "",
Type: apis.ConditionType(lwsspec.LeaderWorkerSetAvailable),
Status: corev1.ConditionUnknown,
Reason: "LWSConditionMissing",
Message: "Available condition is not yet available on the LeaderWorkerSet",
},
},
}
Expand Down
Loading