Fix Rendered condition observedGeneration stale after lifecycle changes (kptdev#1076)

When reconcileRender skips (no render trigger), the Rendered condition's
observedGeneration was never updated. After a lifecycle patch bumped
metadata.generation, kubectl wait --for=condition=Rendered would hang
because kubectl v1.35+ treats observedGeneration < generation as stale.

Add refreshRenderedGeneration() which bumps the Rendered condition's
observedGeneration when it's True but behind the current generation.

Fixes kptdev#1075

Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: efiacor

controllers/packagerevisions/pkg/controllers/packagerevision/packagerevision_controller.go

@@ -234,6 +234,7 @@ func (r *PackageRevisionReconciler) reconcileRender(ctx context.Context, pr *por
 
 	requested, annotationTrigger, sourceTrigger := renderTrigger(pr)
 	if !annotationTrigger && !sourceTrigger {
+		r.refreshRenderedGeneration(ctx, pr)
 		return nil, nil
 	}
 

controllers/packagerevisions/pkg/controllers/packagerevision/status.go

@@ -113,6 +113,23 @@ func (r *PackageRevisionReconciler) updateRenderStatus(ctx context.Context, pr *
 	}
 }
 
+// refreshRenderedGeneration bumps the Rendered condition's observedGeneration
+// when no render is needed but the condition is stale (e.g. after lifecycle patch).
+// It preserves all other condition fields (reason, message, lastTransitionTime)
+// to avoid misleading status churn.
+func (r *PackageRevisionReconciler) refreshRenderedGeneration(ctx context.Context, pr *porchv1alpha2.PackageRevision) {
+	for _, c := range pr.Status.Conditions {
+		if c.Type == porchv1alpha2.ConditionRendered && c.Status == metav1.ConditionTrue && c.ObservedGeneration < pr.Generation {
+			// Only bump observedGeneration — preserve existing reason, message, and transition time.
+			c.ObservedGeneration = pr.Generation
+			r.updateRenderStatus(ctx, pr, pr.Status.RenderingPrrResourceVersion, "",
+				c,
+			)
+			return
+		}
+	}
+}
+
 // setSourceFailed logs the error and sets Ready=False and Rendered=False.
 // Rendered is set even though rendering was never attempted — the package
 // content didn't land successfully, so "not rendered" is accurate.

controllers/packagerevisions/pkg/controllers/packagerevision/status_test.go

@@ -158,6 +158,68 @@ func TestUpdateRenderStatusComplete(t *testing.T) {
 	assert.Equal(t, metav1.ConditionTrue, captured.Conditions[0].Status)
 }
 
+func TestRefreshRenderedGenerationBumpsStale(t *testing.T) {
+	mockClient := mockclient.NewMockClient(t)
+	captured := captureStatusPatch(t, mockClient)
+
+	r := &PackageRevisionReconciler{Client: mockClient}
+	pr := basePR()
+	pr.Generation = 5
+	originalTime := metav1.NewTime(time.Date(2025, 6, 1, 10, 0, 0, 0, time.UTC))
+	pr.Status.RenderingPrrResourceVersion = "prev-render-version"
+	pr.Status.Conditions = []metav1.Condition{
+		{
+			Type:               porchv1alpha2.ConditionRendered,
+			Status:             metav1.ConditionTrue,
+			ObservedGeneration: 2,
+			Reason:             porchv1alpha2.ReasonRendered,
+			Message:            "render complete",
+			LastTransitionTime: originalTime,
+		},
+	}
+
+	r.refreshRenderedGeneration(t.Context(), pr)
+
+	assert.Len(t, captured.Conditions, 1)
+	assert.Equal(t, porchv1alpha2.ConditionRendered, captured.Conditions[0].Type)
+	assert.Equal(t, metav1.ConditionTrue, captured.Conditions[0].Status)
+	assert.Equal(t, int64(5), captured.Conditions[0].ObservedGeneration)
+	// Verify existing fields are preserved, not overwritten.
+	assert.Equal(t, porchv1alpha2.ReasonRendered, captured.Conditions[0].Reason)
+	assert.Equal(t, "render complete", captured.Conditions[0].Message)
+	assert.Equal(t, originalTime, captured.Conditions[0].LastTransitionTime)
+	// Verify renderingPrrResourceVersion is preserved.
+	assert.Equal(t, "prev-render-version", captured.RenderingPrrResourceVersion)
+}
+
+func TestRefreshRenderedGenerationSkipsWhenCurrent(t *testing.T) {
+	mockClient := mockclient.NewMockClient(t)
+	// No Status().Patch expected — should be a no-op.
+
+	r := &PackageRevisionReconciler{Client: mockClient}
+	pr := basePR()
+	pr.Generation = 3
+	pr.Status.Conditions = []metav1.Condition{
+		{Type: porchv1alpha2.ConditionRendered, Status: metav1.ConditionTrue, ObservedGeneration: 3},
+	}
+
+	r.refreshRenderedGeneration(t.Context(), pr)
+}
+
+func TestRefreshRenderedGenerationSkipsWhenNotTrue(t *testing.T) {
+	mockClient := mockclient.NewMockClient(t)
+	// No Status().Patch expected — Rendered is False, not our concern.
+
+	r := &PackageRevisionReconciler{Client: mockClient}
+	pr := basePR()
+	pr.Generation = 5
+	pr.Status.Conditions = []metav1.Condition{
+		{Type: porchv1alpha2.ConditionRendered, Status: metav1.ConditionFalse, ObservedGeneration: 2},
+	}
+
+	r.refreshRenderedGeneration(t.Context(), pr)
+}
+
 func TestSetRenderFailed(t *testing.T) {
 	mockClient := mockclient.NewMockClient(t)
 

test/e2e/crd/lifecycle_test.go

@@ -51,6 +51,18 @@ var _ = Describe("Lifecycle", Ordered, Label("lifecycle"), func() {
 		By("verifying publish metadata")
 		Expect(pr.Status.PublishedBy).NotTo(BeEmpty())
 		Expect(pr.Status.PublishedAt).NotTo(BeNil())
+
+		By("verifying Rendered condition observedGeneration is current after lifecycle changes")
+		Expect(k8sClient.Get(env.Ctx, client.ObjectKeyFromObject(pr), pr)).To(Succeed())
+		foundRendered := false
+		for _, c := range pr.Status.Conditions {
+			if c.Type == porchv1alpha2.ConditionRendered {
+				foundRendered = true
+				Expect(c.ObservedGeneration).To(Equal(pr.Generation),
+					"Rendered observedGeneration should match current generation after lifecycle transition")
+			}
+		}
+		Expect(foundRendered).To(BeTrue(), "expected Rendered condition to be present on the PackageRevision")
 	})
 
 	It("should transition Published → DeletionProposed → Published (undo)", func() {