Using a different Reason to reflect better the state.

weaveworks · Oct 25, 2023 · c47aa79 · c47aa79
1 parent 96a6711
commit c47aa79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/api/v1alpha1/conditions.go b/api/v1alpha1/conditions.go
@@ -10,8 +10,8 @@ const (
 	TargetClusterNotReadyReason string = "TargetClusterNotReady"
 	// ReconciliationSucceededReason signals that a Pipeline has been successfully reconciled.
 	ReconciliationSucceededReason string = "ReconciliationSucceeded"
-	// TargetDifferentRevisionReason signals there are targets	with different revisions.
-	TargetDifferentRevisionReason string = "TargetDifferentRevision"
+	// EnvironmentNotReadyReason signals the environment is not ready.
+	EnvironmentNotReadyReason string = "EnvironmentNotReady"
 )
 
 // Reasons used by the level-triggered controller.

diff --git a/controllers/leveltriggered/controller.go b/controllers/leveltriggered/controller.go
@@ -190,7 +190,7 @@ func (r *PipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	latestRevision := checkAllTargetsHaveSameRevision(pipeline.Status.Environments[firstEnv.Name])
 	if latestRevision == "" {
 		// not all targets have the same revision, or have no revision set, so we can't proceed
-		if err := r.setPendingCondition(ctx, pipeline, v1alpha1.TargetDifferentRevisionReason, "Waiting for all targets to have the same revision"); err != nil {
+		if err := r.setPendingCondition(ctx, pipeline, v1alpha1.EnvironmentNotReadyReason, "Waiting for all targets to have the same revision"); err != nil {
 			return ctrl.Result{Requeue: true}, fmt.Errorf("error setting pending condition: %w", err)
 		}
 
@@ -199,7 +199,7 @@ func (r *PipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 	if !checkAllTargetsAreReady(pipeline.Status.Environments[firstEnv.Name]) {
 		// not all targets are ready, so we can't proceed
-		if err := r.setPendingCondition(ctx, pipeline, v1alpha1.TargetClusterNotReadyReason, "Waiting for all targets to be ready"); err != nil {
+		if err := r.setPendingCondition(ctx, pipeline, v1alpha1.EnvironmentNotReadyReason, "Waiting for all targets to be ready"); err != nil {
 			return ctrl.Result{}, fmt.Errorf("error setting pending condition: %w", err)
 		}
 

diff --git a/controllers/leveltriggered/controller_test.go b/controllers/leveltriggered/controller_test.go
@@ -297,10 +297,10 @@ func TestReconcile(t *testing.T) {
 
 		g.Expect(k8sClient.Create(ctx, pipeline)).To(Succeed())
 		checkCondition(ctx, g, client.ObjectKeyFromObject(pipeline), meta.ReadyCondition, metav1.ConditionTrue, v1alpha1.ReconciliationSucceededReason)
-		checkCondition(ctx, g, client.ObjectKeyFromObject(pipeline), pipelineconditions.PromotionPendingCondition, metav1.ConditionTrue, v1alpha1.TargetDifferentRevisionReason)
+		checkCondition(ctx, g, client.ObjectKeyFromObject(pipeline), pipelineconditions.PromotionPendingCondition, metav1.ConditionTrue, v1alpha1.EnvironmentNotReadyReason)
 
 		setAppRevision(ctx, g, devApp2, "v1.0.0")
-		checkCondition(ctx, g, client.ObjectKeyFromObject(pipeline), pipelineconditions.PromotionPendingCondition, metav1.ConditionTrue, v1alpha1.TargetClusterNotReadyReason)
+		checkCondition(ctx, g, client.ObjectKeyFromObject(pipeline), pipelineconditions.PromotionPendingCondition, metav1.ConditionTrue, v1alpha1.EnvironmentNotReadyReason)
 
 		setAppStatusReadyCondition(ctx, g, devApp2)