fix revision conditions when initial scale isn't achieved

Author: dprotaso

pkg/apis/serving/v1/revision_lifecycle.go

@@ -204,8 +204,10 @@ func (rs *RevisionStatus) PropagateAutoscalerStatus(ps *autoscalingv1alpha1.PodA
 
 	// Mark resource unavailable if we don't have a Service Name and the deployment is ready
 	// This can happen when we have initial scale set to 0
-	if rs.GetCondition(RevisionConditionResourcesAvailable).IsTrue() && ps.ServiceName == "" {
-		rs.MarkResourcesAvailableUnknown(ReasonDeploying, "")
+	if rs.GetCondition(RevisionConditionResourcesAvailable).IsTrue() {
+		if ps.ServiceName == "" || !ps.IsScaleTargetInitialized() {
+			rs.MarkResourcesAvailableUnknown(ReasonDeploying, "")
+		}
 	}
 
 	switch cond.Status {

pkg/apis/serving/v1/revision_lifecycle_test.go

@@ -584,6 +584,44 @@ func TestPropagateAutoscalerStatus(t *testing.T) {
 	apistest.CheckConditionSucceeded(r, RevisionConditionResourcesAvailable, t)
 }
 
+func TestPropagateAutoscalerStatus_ScaleTargetNotInitialized(t *testing.T) {
+	r := &RevisionStatus{}
+	r.InitializeConditions()
+	apistest.CheckConditionOngoing(r, RevisionConditionReady, t)
+
+	// PodAutoscaler has no active condition, so we are just coming up.
+	r.PropagateAutoscalerStatus(&autoscalingv1alpha1.PodAutoscalerStatus{
+		Status: duckv1.Status{},
+	})
+
+	apistest.CheckConditionOngoing(r, RevisionConditionActive, t)
+	apistest.CheckConditionOngoing(r, RevisionConditionResourcesAvailable, t)
+
+	// Deployment is created we mark resources created
+	r.MarkResourcesAvailableTrue()
+
+	// PodAutoscaler resources have been created but initial scale target
+	// has not been acheived
+	r.PropagateAutoscalerStatus(&autoscalingv1alpha1.PodAutoscalerStatus{
+		ServiceName: "some-service",
+		Status: duckv1.Status{
+			Conditions: duckv1.Conditions{{
+				Type:   autoscalingv1alpha1.PodAutoscalerConditionReady,
+				Status: corev1.ConditionUnknown,
+			}, {
+				Type:   autoscalingv1alpha1.PodAutoscalerConditionScaleTargetInitialized,
+				Status: corev1.ConditionUnknown,
+			}, {
+				Type:   autoscalingv1alpha1.PodAutoscalerConditionSKSReady,
+				Status: corev1.ConditionTrue,
+			}},
+		},
+	})
+
+	// ResourcesAvailable should be reverted back to on-going
+	apistest.CheckConditionOngoing(r, RevisionConditionResourcesAvailable, t)
+}
+
 func TestPropagateAutoscalerStatus_NoOverridingResourcesAvailable(t *testing.T) {
 	// Cases to test Ready condition
 	// we fix ScaleTargetInitialized to True

pkg/reconciler/revision/table_test.go

@@ -282,6 +282,7 @@ func TestReconcile(t *testing.T) {
 				WithRoutingState(v1.RoutingStateActive, fc),
 				MarkRevisionReady, WithRevisionObservedGeneration(1)),
 			pa("foo", "pa-not-ready",
+				WithScaleTargetInitialized,
 				WithPAStatusService("its-not-confidential"),
 				WithBufferedTraffic,
 				WithReachabilityReachable),