Addressing comments from Irina

internal/configfsm/fsm.go

@@ -112,7 +112,7 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(Missing).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering Missing")
+			fmt.Println("Entering " + Missing)
 			fsmHelper.ResetNonCompliantAt()
 			if fsmHelper.ArePoliciesMatched() {
 				return fsm.Fire(MissingToClusterNotReady, fsmHelper)
@@ -124,7 +124,7 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(ClusterNotReady).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering ClusterNotReady")
+			fmt.Println("Entering " + ClusterNotReady)
 			if !fsmHelper.ArePoliciesMatched() {
 				return fsm.Fire(ClusterNotReadyToMissing, fsmHelper)
 			}
@@ -140,7 +140,7 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(InProgress).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering InProgress")
+			fmt.Println("Entering " + InProgress)
 			if fsmHelper.IsNonCompliantAtZero() ||
 				fsmHelper.IsAllPoliciesCompliant() ||
 				(!fsmHelper.IsNonCompliantPolicyInEnforce() && !fsmHelper.IsAllPoliciesCompliant()) {
@@ -155,7 +155,7 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 			if !fsmHelper.IsClusterReady() {
 				return fsm.Fire(InProgressToClusterNotReady, fsmHelper)
 			}
-			if !fsmHelper.IsNonCompliantPolicyInEnforce() && !fsmHelper.IsAllPoliciesCompliant() {
+			if !fsmHelper.IsNonCompliantPolicyInEnforce() && !fsmHelper.IsAllPoliciesCompliant() { // checks OutOfDate condition
 				return fsm.Fire(InProgressToOutOfDate, fsmHelper)
 			}
 			if fsmHelper.IsAllPoliciesCompliant() {
@@ -171,11 +171,12 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(OutOfDate).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering InProgress")
+			fmt.Println("Entering " + OutOfDate)
 			fsmHelper.ResetNonCompliantAt()
 			if !fsmHelper.ArePoliciesMatched() ||
 				!fsmHelper.IsClusterReady() ||
-				fsmHelper.IsNonCompliantPolicyInEnforce() {
+				fsmHelper.IsNonCompliantPolicyInEnforce() ||
+				fsmHelper.IsAllPoliciesCompliant() {
 				return fsm.Fire(OutOfDateToInProgress, fsmHelper)
 			}
 			return nil
@@ -185,7 +186,7 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(Completed).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering Completed")
+			fmt.Println("Entering " + Completed)
 			fsmHelper.ResetNonCompliantAt()
 
 			if !fsmHelper.ArePoliciesMatched() ||
@@ -201,10 +202,10 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 	fsm.Configure(TimedOut).
 		OnEntry(func(_ context.Context, args ...any) error {
 			fsmHelper := args[0].(FsmHelper)
-			fmt.Println("Entering TimedOut")
+			fmt.Println("Entering " + TimedOut)
 
 			if !fsmHelper.ArePoliciesMatched() ||
-				(!fsmHelper.IsNonCompliantPolicyInEnforce() &&
+				(!fsmHelper.IsNonCompliantPolicyInEnforce() && // checks OutOfDate condition
 					!fsmHelper.IsAllPoliciesCompliant()) ||
 				fsmHelper.IsAllPoliciesCompliant() {
 				return fsm.Fire(TimedOutToInProgress, fsmHelper)

internal/configfsm/fsm_test.go

@@ -428,6 +428,19 @@ func TestFSMTimedoutOutOfDate(t *testing.T) {
 	state, err = aFSM.State(context.Background())
 	assert.Equal(t, nil, err, "err should be nil")
 	assert.Equal(t, OutOfDate, state, "State should be OutOfDate")
+
+	aTestHelper.ClusterReady = true
+	aTestHelper.NonCompliantPolicyInEnforce = false
+	aTestHelper.AllPoliciesCompliant = true
+
+	_, err = RunFSM(context.Background(), aFSM, &aTestHelper)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	state, err = aFSM.State(context.Background())
+	assert.Equal(t, nil, err, "err should be nil")
+	assert.Equal(t, Completed, state, "State should be Completed")
 }
 
 func TestDisplayGraph(t *testing.T) {

internal/controllers/clusterrequest_controller_test.go

@@ -953,7 +953,9 @@ var _ = Describe("ClusterRequestReconcile", func() {
 			managedCluster = &clusterv1.ManagedCluster{
 				ObjectMeta: metav1.ObjectMeta{Name: crName},
 				Status: clusterv1.ManagedClusterStatus{
-					Conditions: []metav1.Condition{{Type: clusterv1.ManagedClusterConditionAvailable, Status: metav1.ConditionFalse}},
+					Conditions: []metav1.Condition{{Type: clusterv1.ManagedClusterConditionAvailable, Status: metav1.ConditionFalse},
+						{Type: clusterv1.ManagedClusterConditionJoined, Status: metav1.ConditionFalse},
+						{Type: clusterv1.ManagedClusterConditionHubAccepted, Status: metav1.ConditionFalse}},
 				},
 			}
 			Expect(c.Create(ctx, managedCluster)).To(Succeed())
@@ -1025,9 +1027,16 @@ var _ = Describe("ClusterRequestReconcile", func() {
 			clusterInstance.Status.Conditions = append(clusterInstance.Status.Conditions, crProvisionedCond)
 			Expect(c.Status().Update(ctx, clusterInstance)).To(Succeed())
 			// Patch ManagedCluster to ready
-			readyCond := meta.FindStatusCondition(
+			availableCond := meta.FindStatusCondition(
 				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionAvailable)
-			readyCond.Status = metav1.ConditionTrue
+			joinedCond := meta.FindStatusCondition(
+				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionJoined)
+			acceptedCond := meta.FindStatusCondition(
+				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionHubAccepted)
+			availableCond.Status = metav1.ConditionTrue
+			joinedCond.Status = metav1.ConditionTrue
+			acceptedCond.Status = metav1.ConditionTrue
+
 			Expect(c.Status().Update(ctx, managedCluster)).To(Succeed())
 			// Patch enforce policy to Compliant
 			policy.Status.ComplianceState = "Compliant"
@@ -1121,9 +1130,15 @@ var _ = Describe("ClusterRequestReconcile", func() {
 			currentCI.Status.Conditions = append(clusterInstance.Status.Conditions, crProvisionedCond)
 			Expect(c.Status().Update(ctx, currentCI)).To(Succeed())
 			// Patch ManagedCluster to ready
-			readyCond := meta.FindStatusCondition(
+			availableCond := meta.FindStatusCondition(
 				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionAvailable)
-			readyCond.Status = metav1.ConditionTrue
+			joinedCond := meta.FindStatusCondition(
+				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionJoined)
+			acceptedCond := meta.FindStatusCondition(
+				managedCluster.Status.Conditions, clusterv1.ManagedClusterConditionHubAccepted)
+			availableCond.Status = metav1.ConditionTrue
+			joinedCond.Status = metav1.ConditionTrue
+			acceptedCond.Status = metav1.ConditionTrue
 			Expect(c.Status().Update(ctx, managedCluster)).To(Succeed())
 			// Patch enforce policy to Compliant
 			policy.Status.ComplianceState = "Compliant"

internal/controllers/utils/utils.go

@@ -1034,6 +1034,8 @@ func ClusterIsReadyForPolicyConfig(
 	}
 
 	available := false
+	hubAccepted := false
+	joined := false
 
 	availableCondition := meta.FindStatusCondition(
 		managedCluster.Status.Conditions,
@@ -1042,7 +1044,21 @@ func ClusterIsReadyForPolicyConfig(
 		available = true
 	}
 
-	return available, nil
+	acceptedCondition := meta.FindStatusCondition(
+		managedCluster.Status.Conditions,
+		clusterv1.ManagedClusterConditionHubAccepted)
+	if acceptedCondition != nil && acceptedCondition.Status == metav1.ConditionTrue {
+		hubAccepted = true
+	}
+
+	joinedCondition := meta.FindStatusCondition(
+		managedCluster.Status.Conditions,
+		clusterv1.ManagedClusterConditionJoined)
+	if joinedCondition != nil && joinedCondition.Status == metav1.ConditionTrue {
+		joined = true
+	}
+
+	return available && hubAccepted && joined, nil
 }
 
 // TimeoutExceeded returns true if it's been more time than the timeout configuration.