Merge pull request #1325 from vincepri/better-reference-error-handling

✨ Improve ErrorMessage from referenced resources
kubernetes-sigs · Sep 4, 2019 · b9b33c7 · b9b33c7
2 parents 5713990 + 11c5525
commit b9b33c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/controllers/cluster_controller_phases.go b/controllers/cluster_controller_phases.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
@@ -120,7 +121,10 @@ func (r *ClusterReconciler) reconcileExternal(ctx context.Context, cluster *clus
 		cluster.Status.ErrorReason = &clusterStatusError
 	}
 	if errorMessage != "" {
-		cluster.Status.ErrorMessage = pointer.StringPtr(errorMessage)
+		cluster.Status.ErrorMessage = pointer.StringPtr(
+			fmt.Sprintf("Failure detected from referenced resource %v with name %q: %s",
+				obj.GroupVersionKind(), obj.GetName(), errorMessage),
+		)
 	}
 
 	return obj, nil

diff --git a/controllers/machine_controller_phases.go b/controllers/machine_controller_phases.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
@@ -128,7 +129,10 @@ func (r *MachineReconciler) reconcileExternal(ctx context.Context, m *clusterv1.
 		m.Status.ErrorReason = &machineStatusError
 	}
 	if errorMessage != "" {
-		m.Status.ErrorMessage = pointer.StringPtr(errorMessage)
+		m.Status.ErrorMessage = pointer.StringPtr(
+			fmt.Sprintf("Failure detected from referenced resource %v with name %q: %s",
+				obj.GroupVersionKind(), obj.GetName(), errorMessage),
+		)
 	}
 
 	return obj, nil