chore: improve log message output and consistency

Signed-off-by: Dustin Scott <dscott@redhat.com>
rh-mobb · Jul 12, 2023 · 3852ea1 · 3852ea1
1 parent c1d6053
commit 3852ea1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/controllers/phases/cluster.go b/controllers/phases/cluster.go
@@ -60,10 +60,11 @@ func HandleClusterPhase(
 	if cluster.State() != clustersmgmtv1.ClusterStateReady {
 		logger.Info(
 			fmt.Sprintf(
-				"cluster [%s] with state [%s] is not ready...requeueing",
+				"cluster [%s] with state [%s] is not ready",
 				req.GetClusterName(),
 				cluster.State(),
 			), request.LogValues(req)...)
+		logger.Info(fmt.Sprintf("checking again in %s", defaultMissingUpstreamRequeue.String()), request.LogValues(req)...)
 
 		return requeue.After(defaultMissingUpstreamRequeue, nil)
 	}

diff --git a/controllers/reconcilers/machinepool/request.go b/controllers/reconcilers/machinepool/request.go
@@ -200,7 +200,7 @@ func (req *MachinePoolRequest) updateNodePool(poolClient *ocm.NodePoolClient) er
 // deleteMachinePool deletes a machine pool object in OCM.
 func (req *MachinePoolRequest) deleteMachinePool(poolClient *ocm.MachinePoolClient) error {
 	if err := poolClient.Delete(req.Desired.Spec.DisplayName); err != nil {
-		return fmt.Errorf("unable to update machine pool - %w", err)
+		return fmt.Errorf("unable to delete machine pool - %w", err)
 	}
 
 	return nil

diff --git a/controllers/reconcilers/rosacluster/phases.go b/controllers/reconcilers/rosacluster/phases.go
@@ -294,13 +294,13 @@ func (r *Controller) WaitUntilReady(req *ROSAClusterRequest) (ctrl.Result, error
 
 		return phases.Next()
 	case clustersmgmtv1.ClusterStateError:
-		req.Log.Error(fmt.Errorf("cluster is in error state"), fmt.Sprintf(
+		req.Log.Error(fmt.Errorf("cluster has error state"), fmt.Sprintf(
 			"checking again in %s", req.provisionRequeueTime().String(),
 		), request.LogValues(req)...)
 
 		return requeue.After(req.provisionRequeueTime(), nil)
 	default:
-		req.Log.Info("cluster is not ready", request.LogValues(req)...)
+		req.Log.Info(fmt.Sprintf("cluster with state [%s] is not ready", req.Cluster.State()), request.LogValues(req)...)
 		req.Log.Info(fmt.Sprintf("checking again in %s", req.provisionRequeueTime().String()), request.LogValues(req)...)
 
 		return requeue.After(req.provisionRequeueTime(), nil)