Updated Status Messages and Types

Signed-off-by: Lucifergene <[email protected]>

Author: Lucifergene

api/v1alpha1/common_types.go

@@ -13,8 +13,8 @@ const (
 	// ConditionProgressing is True when the operator is progressing
 	ConditionProgressing ConditionType = "Progressing"
 
-	// ConditionApplicationReady is True when the application is ready
-	ConditionApplicationReady ConditionType = "ApplicationReady"
+	// ConditionReady is True when the application is ready
+	ConditionReady ConditionType = "Ready"
 
 	// ConditionGitRepoReachable is True if the Git repository is reachable
 	ConditionGitRepoReachable ConditionType = "GitRepoReachable"

controller/consoleapplication_controller.go

@@ -112,7 +112,7 @@ func (r *ConsoleApplicationReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return NoRequeue()
 	}
 
-	// Add the Strategy Service here
+	// Add the Strategy Service here: Return the list of resources config that needs to be created
 
 	logger.Info("All done!")
 	SetSucceeded(operatorCR)

controller/status.go

@@ -39,14 +39,14 @@ func SetStarted(operatorCR *appsv1alpha1.ConsoleApplication) {
 		Status:             metav1.ConditionTrue,
 		Reason:             "Reconciling",
 		LastTransitionTime: metav1.NewTime(time.Now()),
-		Message:            "Reconciliation in progress",
+		Message:            "Requirements are being met",
 	})
 }
 
 // SetFailed sets the Operator Progressing and Application Ready conditions to False with the provided reason and message.
 func SetFailed(operatorCR *appsv1alpha1.ConsoleApplication, reason, message string) {
 	meta.SetStatusCondition(&operatorCR.Status.Conditions, metav1.Condition{
-		Type:               appsv1alpha1.ConditionApplicationReady.String(),
+		Type:               appsv1alpha1.ConditionReady.String(),
 		Status:             metav1.ConditionFalse,
 		Reason:             reason,
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -57,14 +57,14 @@ func SetFailed(operatorCR *appsv1alpha1.ConsoleApplication, reason, message stri
 		Status:             metav1.ConditionFalse,
 		Reason:             appsv1alpha1.ReasonReconcileFailed.String(),
 		LastTransitionTime: metav1.NewTime(time.Now()),
-		Message:            "Reconciliation failed",
+		Message:            message,
 	})
 }
 
 // SetSucceeded sets the Operator Progressing and Application Ready conditions to True.
 func SetSucceeded(operatorCR *appsv1alpha1.ConsoleApplication) {
 	meta.SetStatusCondition(&operatorCR.Status.Conditions, metav1.Condition{
-		Type:               appsv1alpha1.ConditionApplicationReady.String(),
+		Type:               appsv1alpha1.ConditionReady.String(),
 		Status:             metav1.ConditionTrue,
 		Reason:             appsv1alpha1.ReasonAllResourcesReady.String(),
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -75,7 +75,7 @@ func SetSucceeded(operatorCR *appsv1alpha1.ConsoleApplication) {
 		Status:             metav1.ConditionFalse,
 		Reason:             appsv1alpha1.ReasonReconcileCompleted.String(),
 		LastTransitionTime: metav1.NewTime(time.Now()),
-		Message:            "Reconciliation completed successfully",
+		Message:            "All requirements are met",
 	})
 }