HYPERFLEET-1064 - feat: e2e test to use LastKnownReconciled

rh-amarin · rh-amarin · commit 337b3f4ea17a · 2026-05-13T08:39:58.000+02:00
diff --git a/e2e/adapter/adapter_failover.go b/e2e/adapter/adapter_failover.go
@@ -121,10 +121,10 @@ var _ = ginkgo.Describe("[Suite: adapter-failures][negative] Adapter framework c
 					g.Expect(hasReconciledFalse).To(BeTrue(),
 						"initial cluster conditions should have Reconciled=False")
 
-					hasAvailableFalse := h.HasResourceCondition(cluster.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusFalse)
+					hasAvailableFalse := h.HasAnyResourceCondition(cluster.Status.Conditions,
+						openapi.ResourceConditionStatusFalse, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)
 					g.Expect(hasAvailableFalse).To(BeTrue(),
-						"initial cluster conditions should have Available=False")
+						"initial cluster conditions should have Available/LastKnownReconciled=False")
 				}, h.Cfg.Timeouts.Adapter.Processing, h.Cfg.Polling.Interval).Should(Succeed())
 
 				ginkgo.By("Verify adapter execution detects failure and reports error")
diff --git a/e2e/cluster/adapter_failure.go b/e2e/cluster/adapter_failure.go
@@ -168,9 +168,9 @@ var _ = ginkgo.Describe("[Suite: cluster][negative] Cluster Can Reflect Adapter
 						client.ConditionTypeReconciled, openapi.ResourceConditionStatusFalse)).To(BeTrue(),
 						"cluster Reconciled condition should remain False")
 
-					g.Expect(h.HasResourceCondition(cl.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusFalse)).To(BeTrue(),
-						"cluster Available condition should remain False")
+					g.Expect(h.HasAnyResourceCondition(cl.Status.Conditions,
+						openapi.ResourceConditionStatusFalse, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)).To(BeTrue(),
+						"cluster Available/LastKnownReconciled condition should remain False")
 				}, h.Cfg.Polling.Interval*3, h.Cfg.Polling.Interval).Should(Succeed())
 
 				ginkgo.GinkgoWriter.Printf("Verified cluster top-level status: Reconciled=False, Available=False (reflecting adapter failure)\n")
diff --git a/e2e/cluster/concurrent_creation.go b/e2e/cluster/concurrent_creation.go
@@ -93,10 +93,10 @@ var _ = ginkgo.Describe("[Suite: cluster][concurrent] System can process concurr
 					cluster, err := h.Client.GetCluster(ctx, clusterID)
 					Expect(err).NotTo(HaveOccurred(), "failed to get cluster %d (%s)", i, clusterID)
 
-					hasAvailable := h.HasResourceCondition(cluster.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)
+					hasAvailable := h.HasAnyResourceCondition(cluster.Status.Conditions,
+						openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)
 					Expect(hasAvailable).To(BeTrue(),
-						"cluster %d (%s) should have Available=True", i, clusterID)
+						"cluster %d (%s) should have Available/LastKnownReconciled=True", i, clusterID)
 
 					ginkgo.GinkgoWriter.Printf("Cluster %d (%s) reached Reconciled=True, Available=True\n", i, clusterID)
 				}
diff --git a/e2e/cluster/crash_recovery.go b/e2e/cluster/crash_recovery.go
@@ -245,8 +245,8 @@ func verifyClusterReconciled(ctx context.Context, h *helper.Helper, clusterID st
 			client.ConditionTypeReconciled, openapi.ResourceConditionStatusTrue)).To(BeTrue(),
 			"cluster Reconciled condition should transition to True")
 
-		g.Expect(h.HasResourceCondition(cl.Status.Conditions,
-			client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)).To(BeTrue(),
-			"cluster Available condition should transition to True")
+		g.Expect(h.HasAnyResourceCondition(cl.Status.Conditions,
+			openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)).To(BeTrue(),
+			"cluster Available/LastKnownReconciled condition should transition to True")
 	}, h.Cfg.Timeouts.Cluster.Reconciled, h.Cfg.Polling.Interval).Should(Succeed())
 }
diff --git a/e2e/cluster/creation.go b/e2e/cluster/creation.go
@@ -122,13 +122,13 @@ var _ = ginkgo.Describe("[Suite: cluster][baseline] Cluster Resource Type Lifecy
 						client.ConditionTypeReconciled, openapi.ResourceConditionStatusTrue)
 					Expect(hasReconciled).To(BeTrue(), "cluster should have Reconciled=True condition")
 
-					hasAvailable := h.HasResourceCondition(finalCluster.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)
-					Expect(hasAvailable).To(BeTrue(), "cluster should have Available=True condition")
+					hasAvailable := h.HasAnyResourceCondition(finalCluster.Status.Conditions,
+						openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)
+					Expect(hasAvailable).To(BeTrue(), "cluster should have Available/LastKnownReconciled=True condition")
 
-					// Validate observedGeneration for Reconciled and Available conditions
+					// Validate observedGeneration for Reconciled and Available/LastKnownReconciled conditions
 					for _, condition := range finalCluster.Status.Conditions {
-						if condition.Type == client.ConditionTypeReconciled || condition.Type == client.ConditionTypeAvailable {
+						if condition.Type == client.ConditionTypeReconciled || condition.Type == client.ConditionTypeAvailable || condition.Type == client.ConditionTypeLastKnownReconciled {
 							Expect(condition.ObservedGeneration).To(Equal(int32(1)),
 								"cluster condition %s should have observed_generation=1 for new creation request", condition.Type)
 						}
diff --git a/e2e/cluster/update_edge_cases.go b/e2e/cluster/update_edge_cases.go
@@ -129,11 +129,11 @@ var _ = ginkgo.Describe("[Suite: cluster][update] Labels-Only PATCH",
 			Eventually(h.PollClusterAdapterStatuses(ctx, clusterID), h.Cfg.Timeouts.Adapter.Processing, h.Cfg.Polling.Interval).
 				Should(helper.HaveAllAdaptersAtGeneration(h.Cfg.Adapters.Cluster, int32(2)))
 
-			ginkgo.By("verifying cluster reaches Reconciled=True and Available=True")
+			ginkgo.By("verifying cluster reaches Reconciled=True and Available/LastKnownReconciled=True")
 			Eventually(h.PollCluster(ctx, clusterID), h.Cfg.Timeouts.Cluster.Reconciled, h.Cfg.Polling.Interval).
 				Should(helper.HaveResourceCondition(client.ConditionTypeReconciled, openapi.ResourceConditionStatusTrue))
 			Eventually(h.PollCluster(ctx, clusterID), h.Cfg.Timeouts.Cluster.Reconciled, h.Cfg.Polling.Interval).
-				Should(helper.HaveResourceCondition(client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue))
+				Should(helper.HaveAnyResourceCondition(openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled))
 
 			finalCluster, err := h.Client.GetCluster(ctx, clusterID)
 			Expect(err).NotTo(HaveOccurred())
diff --git a/e2e/nodepool/concurrent_creation.go b/e2e/nodepool/concurrent_creation.go
@@ -111,10 +111,10 @@ var _ = ginkgo.Describe("[Suite: nodepool][concurrent] Multiple nodepools can co
 					np, err := h.Client.GetNodePool(ctx, clusterID, npID)
 					Expect(err).NotTo(HaveOccurred(), "failed to get nodepool %d (%s)", i, npID)
 
-					hasAvailable := h.HasResourceCondition(np.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)
+					hasAvailable := h.HasAnyResourceCondition(np.Status.Conditions,
+						openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)
 					Expect(hasAvailable).To(BeTrue(),
-						"nodepool %d (%s) should have Available=True", i, npID)
+						"nodepool %d (%s) should have Available/LastKnownReconciled=True", i, npID)
 
 					ginkgo.GinkgoWriter.Printf("Nodepool %d (%s) reached Reconciled=True, Available=True\n", i, npID)
 				}
diff --git a/e2e/nodepool/creation.go b/e2e/nodepool/creation.go
@@ -130,13 +130,13 @@ var _ = ginkgo.Describe("[Suite: nodepool][baseline] NodePool Resource Type Life
 						client.ConditionTypeReconciled, openapi.ResourceConditionStatusTrue)
 					Expect(hasReconciled).To(BeTrue(), "nodepool should have Reconciled=True condition")
 
-					hasAvailable := h.HasResourceCondition(finalNodePool.Status.Conditions,
-						client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)
-					Expect(hasAvailable).To(BeTrue(), "nodepool should have Available=True condition")
+					hasAvailable := h.HasAnyResourceCondition(finalNodePool.Status.Conditions,
+						openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled)
+					Expect(hasAvailable).To(BeTrue(), "nodepool should have Available/LastKnownReconciled=True condition")
 
-					// Validate observedGeneration for Reconciled and Available conditions
+					// Validate observedGeneration for Reconciled and Available/LastKnownReconciled conditions
 					for _, condition := range finalNodePool.Status.Conditions {
-						if condition.Type == client.ConditionTypeReconciled || condition.Type == client.ConditionTypeAvailable {
+						if condition.Type == client.ConditionTypeReconciled || condition.Type == client.ConditionTypeAvailable || condition.Type == client.ConditionTypeLastKnownReconciled {
 							Expect(condition.ObservedGeneration).To(Equal(int32(1)),
 								"nodepool condition %s should have observed_generation=1 for new creation request", condition.Type)
 						}
diff --git a/e2e/nodepool/update_edge_cases.go b/e2e/nodepool/update_edge_cases.go
@@ -68,11 +68,11 @@ var _ = ginkgo.Describe("[Suite: nodepool][update] Labels-Only PATCH",
 			Eventually(h.PollNodePoolAdapterStatuses(ctx, clusterID, nodepoolID), h.Cfg.Timeouts.Adapter.Processing, h.Cfg.Polling.Interval).
 				Should(helper.HaveAllAdaptersAtGeneration(h.Cfg.Adapters.NodePool, int32(2)))
 
-			ginkgo.By("verifying nodepool reaches Reconciled=True and Available=True")
+			ginkgo.By("verifying nodepool reaches Reconciled=True and Available/LastKnownReconciled=True")
 			Eventually(h.PollNodePool(ctx, clusterID, nodepoolID), h.Cfg.Timeouts.NodePool.Reconciled, h.Cfg.Polling.Interval).
 				Should(helper.HaveResourceCondition(client.ConditionTypeReconciled, openapi.ResourceConditionStatusTrue))
 			Eventually(h.PollNodePool(ctx, clusterID, nodepoolID), h.Cfg.Timeouts.NodePool.Reconciled, h.Cfg.Polling.Interval).
-				Should(helper.HaveResourceCondition(client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue))
+				Should(helper.HaveAnyResourceCondition(openapi.ResourceConditionStatusTrue, client.ConditionTypeAvailable, client.ConditionTypeLastKnownReconciled))
 
 			finalNP, err := h.Client.GetNodePool(ctx, clusterID, nodepoolID)
 			Expect(err).NotTo(HaveOccurred())
diff --git a/pkg/client/constants.go b/pkg/client/constants.go
@@ -18,5 +18,6 @@ const (
 
 // Condition types used by cluster-level resources (clusters, nodepools)
 const (
-	ConditionTypeReconciled = "Reconciled" // Resource is reconciled
+	ConditionTypeReconciled          = "Reconciled"          // Resource is reconciled
+	ConditionTypeLastKnownReconciled = "LastKnownReconciled" // API-computed aggregated condition (renamed from Available)
 )
diff --git a/pkg/helper/matchers.go b/pkg/helper/matchers.go
@@ -12,13 +12,19 @@ import (
 
 // HaveResourceCondition matches a *Cluster or *NodePool that has the specified condition type and status.
 func HaveResourceCondition(condType string, status openapi.ResourceConditionStatus) types.GomegaMatcher {
-	return &resourceConditionMatcher{condType: condType, status: status}
+	return &resourceConditionMatcher{condTypes: []string{condType}, status: status}
+}
+
+// HaveAnyResourceCondition matches a *Cluster or *NodePool that has any of the given condition types with the given status.
+// Use during API transitions where a condition may appear under multiple names.
+func HaveAnyResourceCondition(status openapi.ResourceConditionStatus, condTypes ...string) types.GomegaMatcher {
+	return &resourceConditionMatcher{condTypes: condTypes, status: status}
 }
 
 type resourceConditionMatcher struct {
-	condType string
-	status   openapi.ResourceConditionStatus
-	actual   string
+	condTypes []string
+	status    openapi.ResourceConditionStatus
+	actual    string
 }
 
 func (m *resourceConditionMatcher) Match(actual any) (bool, error) {
@@ -31,20 +37,22 @@ func (m *resourceConditionMatcher) Match(actual any) (bool, error) {
 		return false, nil
 	}
 	for _, c := range conditions {
-		if c.Type == m.condType && c.Status == m.status {
-			return true, nil
+		for _, ct := range m.condTypes {
+			if c.Type == ct && c.Status == m.status {
+				return true, nil
+			}
 		}
 	}
 	m.actual = formatResourceConditions(conditions)
 	return false, nil
 }
 
 func (m *resourceConditionMatcher) FailureMessage(_ any) string {
-	return fmt.Sprintf("expected condition %s=%s but got: %s", m.condType, m.status, m.actual)
+	return fmt.Sprintf("expected condition %s=%s but got: %s", strings.Join(m.condTypes, "|"), m.status, m.actual)
 }
 
 func (m *resourceConditionMatcher) NegatedFailureMessage(_ any) string {
-	return fmt.Sprintf("expected NOT to have condition %s=%s", m.condType, m.status)
+	return fmt.Sprintf("expected NOT to have condition %s=%s", strings.Join(m.condTypes, "|"), m.status)
 }
 
 // HaveAllAdaptersWithCondition matches an *AdapterStatusList where every required
diff --git a/pkg/helper/validation.go b/pkg/helper/validation.go
@@ -11,7 +11,7 @@ func (h *Helper) HasAdapterCondition(conditions []openapi.AdapterCondition, cond
 	return hasAdapterCond(conditions, condType, status)
 }
 
-// HasResourceCondition checks if a resource condition with the given type and status exists in the conditions list
+// HasResourceCondition checks if a resource condition with the given type and status exists in the conditions list.
 func (h *Helper) HasResourceCondition(conditions []openapi.ResourceCondition, condType string, status openapi.ResourceConditionStatus) bool {
 	for _, cond := range conditions {
 		if cond.Type == condType && cond.Status == status {
@@ -21,6 +21,19 @@ func (h *Helper) HasResourceCondition(conditions []openapi.ResourceCondition, co
 	return false
 }
 
+// HasAnyResourceCondition checks if any of the given condition types with the given status exists in the conditions list.
+// Use during API transitions where a condition may appear under multiple names.
+func (h *Helper) HasAnyResourceCondition(conditions []openapi.ResourceCondition, status openapi.ResourceConditionStatus, condTypes ...string) bool {
+	for _, cond := range conditions {
+		for _, ct := range condTypes {
+			if cond.Type == ct && cond.Status == status {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 // GetCondition retrieves a condition by type from the conditions list
 func (h *Helper) GetCondition(conditions []openapi.AdapterCondition, condType string) *openapi.AdapterCondition {
 	for i := range conditions {

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ const (`
`18`	`18`
`19`	`19`	`// Condition types used by cluster-level resources (clusters, nodepools)`
`20`	`20`	`const (`
`21`		`- ConditionTypeReconciled = "Reconciled" // Resource is reconciled`
	`21`	`+ ConditionTypeReconciled = "Reconciled" // Resource is reconciled`
	`22`	`+ ConditionTypeLastKnownReconciled = "LastKnownReconciled" // API-computed aggregated condition (renamed from Available)`
`22`	`23`	`)`