Propagate HasBeenActive to a terminal condition as "ScaleTargetInitialized".

pkg/apis/autoscaling/v1alpha1/pa_lifecycle.go

@@ -32,6 +32,7 @@ const hasBeenActiveAnnotation = "HasBeenActive"
 
 var podCondSet = apis.NewLivingConditionSet(
 	PodAutoscalerConditionActive,
+	PodAutoscalerConditionHasBeenActive,
 )
 
 // GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
@@ -176,18 +177,12 @@ func (pas *PodAutoscalerStatus) IsInactive() bool {
 
 // HasBeenActive returns true if the pod autoscaler has reached its initial scale.
 func (pas *PodAutoscalerStatus) HasBeenActive() bool {
-	if val, ok := pas.Annotations[hasBeenActiveAnnotation]; !ok || val != "true" {
-		return false
-	}
-	return true
+	return pas.GetCondition(PodAutoscalerConditionHasBeenActive).IsTrue()
 }
 
 // MarkHasBeenActive marks the PA's PodAutoscalerConditionInitiallyActive condition true.
 func (pas *PodAutoscalerStatus) MarkHasBeenActive() {
-	if pas.Annotations == nil {
-		pas.Annotations = map[string]string{}
-	}
-	pas.Annotations[hasBeenActiveAnnotation] = "true"
+	podCondSet.Manage(pas).MarkTrue(PodAutoscalerConditionHasBeenActive)
 }
 
 // GetCondition gets the condition `t`.

pkg/apis/autoscaling/v1alpha1/pa_lifecycle_test.go

@@ -980,6 +980,7 @@ func TestTypicalFlow(t *testing.T) {
 
 	// When we see traffic, mark ourselves active.
 	r.MarkActive()
+	r.MarkHasBeenActive()
 	apistest.CheckConditionSucceeded(r, PodAutoscalerConditionActive, t)
 	apistest.CheckConditionSucceeded(r, PodAutoscalerConditionReady, t)
 

pkg/apis/autoscaling/v1alpha1/pa_types.go

@@ -112,6 +112,9 @@ const (
 	// PodAutoscalerConditionReady is set when the revision is starting to materialize
 	// runtime resources, and becomes true when those resources are ready.
 	PodAutoscalerConditionReady = apis.ConditionReady
+	// PodAutoscalerConditionHasBeenActive is set when the PodAutoscaler's ScaleTargetRef was ready to
+	// serve traffic once.
+	PodAutoscalerConditionHasBeenActive apis.ConditionType = "HasBeenActive"
 	// PodAutoscalerConditionActive is set when the PodAutoscaler's ScaleTargetRef is receiving traffic.
 	PodAutoscalerConditionActive apis.ConditionType = "Active"
 )

pkg/reconciler/autoscaling/hpa/hpa_test.go

@@ -442,6 +442,7 @@ func pa(namespace, name string, options ...PodAutoscalerOption) *asv1a1.PodAutos
 			ProtocolType: networking.ProtocolHTTP1,
 		},
 	}
+	pa.Status.InitializeConditions()
 	for _, opt := range options {
 		opt(pa)
 	}

pkg/reconciler/autoscaling/kpa/kpa_test.go

@@ -202,6 +202,7 @@ func kpa(ns, n string, opts ...PodAutoscalerOption) *asv1a1.PodAutoscaler {
 	kpa.Generation = 1
 	kpa.Annotations["autoscaling.knative.dev/class"] = "kpa.autoscaling.knative.dev"
 	kpa.Annotations["autoscaling.knative.dev/metric"] = "concurrency"
+	kpa.Status.InitializeConditions()
 	for _, opt := range opts {
 		opt(kpa)
 	}

pkg/reconciler/revision/revision_test.go

@@ -108,6 +108,7 @@ func testReadyPA(rev *v1.Revision) *av1alpha1.PodAutoscaler {
 	pa := resources.MakePA(rev)
 	pa.Status.InitializeConditions()
 	pa.Status.MarkActive()
+	pa.Status.MarkHasBeenActive()
 	pa.Status.ServiceName = serviceName(rev.Name)
 	return pa
 }

pkg/reconciler/revision/table_test.go

@@ -247,7 +247,7 @@ func TestReconcile(t *testing.T) {
 		Objects: []runtime.Object{
 			rev("foo", "pa-ready",
 				withK8sServiceName("old-stuff"), WithLogURL, AllUnknownConditions),
-			pa("foo", "pa-ready", WithTraffic, WithPAStatusService("new-stuff"), WithReachabilityUnknown),
+			pa("foo", "pa-ready", WithTraffic, WithHasBeenActive, WithPAStatusService("new-stuff"), WithReachabilityUnknown),
 			deploy(t, "foo", "pa-ready"),
 			image("foo", "pa-ready"),
 		},
@@ -343,7 +343,7 @@ func TestReconcile(t *testing.T) {
 				withK8sServiceName("ill-follow-the-sun"), WithLogURL, MarkRevisionReady,
 				WithRevisionLabel(serving.RouteLabelKey, "foo")),
 			pa("foo", "fix-mutated-pa", WithProtocolType(networking.ProtocolH2C),
-				WithTraffic, WithPAStatusService("fix-mutated-pa")),
+				WithTraffic, WithHasBeenActive, WithPAStatusService("fix-mutated-pa")),
 			deploy(t, "foo", "fix-mutated-pa"),
 			image("foo", "fix-mutated-pa"),
 		},
@@ -357,7 +357,7 @@ func TestReconcile(t *testing.T) {
 				withDefaultContainerStatuses(), withObservedGeneration(1)),
 		}},
 		WantUpdates: []clientgotesting.UpdateActionImpl{{
-			Object: pa("foo", "fix-mutated-pa", WithTraffic,
+			Object: pa("foo", "fix-mutated-pa", WithTraffic, WithHasBeenActive,
 				WithPAStatusService("fix-mutated-pa"), WithReachabilityReachable),
 		}},
 		WantEvents: []string{
@@ -511,7 +511,7 @@ func TestReconcile(t *testing.T) {
 		// This signal should make our Reconcile mark the Revision as Ready.
 		Objects: []runtime.Object{
 			rev("foo", "steady-ready", withK8sServiceName("very-steady"), WithLogURL),
-			pa("foo", "steady-ready", WithTraffic, WithPAStatusService("steadier-even")),
+			pa("foo", "steady-ready", WithTraffic, WithHasBeenActive, WithPAStatusService("steadier-even")),
 			deploy(t, "foo", "steady-ready"),
 			image("foo", "steady-ready"),
 		},

pkg/testing/functional.go

@@ -84,6 +84,11 @@ func WithTraffic(pa *asv1a1.PodAutoscaler) {
 	pa.Status.MarkActive()
 }
 
+// WithHasBeenActive updates the PA to reflect it having been active.
+func WithHasBeenActive(pa *asv1a1.PodAutoscaler) {
+	pa.Status.MarkHasBeenActive()
+}
+
 // WithPAStatusService annotates PA Status with the provided service name.
 func WithPAStatusService(svc string) PodAutoscalerOption {
 	return func(pa *asv1a1.PodAutoscaler) {