Merge pull request #4685 from harveyxia/awsmachinepool-wrap-error

k8s-ci-robot · web-flow · commit 61bbac475824 · 2024-01-09T10:51:33.000+01:00
🐛 Wrap error when AWSMachinePool reconciler fails to get infra provider cluster
diff --git a/exp/controllers/awsmachinepool_controller.go b/exp/controllers/awsmachinepool_controller.go
@@ -122,7 +122,7 @@ func (r *AWSMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	infraCluster, err := r.getInfraCluster(ctx, log, cluster, awsMachinePool)
 	if err != nil {
-		return ctrl.Result{}, errors.New("error getting infra provider cluster or control plane object")
+		return ctrl.Result{}, fmt.Errorf("getting infra provider cluster or control plane object: %w", err)
 	}
 	if infraCluster == nil {
 		log.Info("AWSCluster or AWSManagedControlPlane is not ready yet")

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func (r *AWSMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`122`	`122`
`123`	`123`	`infraCluster, err := r.getInfraCluster(ctx, log, cluster, awsMachinePool)`
`124`	`124`	`if err != nil {`
`125`		`- return ctrl.Result{}, errors.New("error getting infra provider cluster or control plane object")`
	`125`	`+ return ctrl.Result{}, fmt.Errorf("getting infra provider cluster or control plane object: %w", err)`
`126`	`126`	`}`
`127`	`127`	`if infraCluster == nil {`
`128`	`128`	`log.Info("AWSCluster or AWSManagedControlPlane is not ready yet")`