Merge pull request #203 from ukinau/Support-Reason-Field-In-ForgetError

Allow to put Reason in controller.ForgetError
rancher · Oct 4, 2018 · 8e5e5a6 · 8e5e5a6
2 parents d675dc7 + b18da6e
commit 8e5e5a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/condition/condition.go b/condition/condition.go
@@ -89,9 +89,16 @@ func (c Cond) ReasonAndMessageFromError(obj runtime.Object, err error) {
 	}
 	cond := findOrCreateCond(obj, string(c))
 	setValue(cond, "Message", err.Error())
-	if ce, ok := err.(*conditionError); ok {
+	switch ce := err.(type) {
+	case *conditionError:
 		setValue(cond, "Reason", ce.reason)
-	} else {
+	case *controller.ForgetError:
+		if ce.Reason != "" {
+			setValue(cond, "Reason", ce.Reason)
+		} else {
+			setValue(cond, "Reason", "Error")
+		}
+	default:
 		setValue(cond, "Reason", "Error")
 	}
 }

diff --git a/controller/error.go b/controller/error.go
@@ -1,7 +1,8 @@
 package controller
 
 type ForgetError struct {
-	Err error
+	Err    error
+	Reason string
 }
 
 func (f *ForgetError) Error() string {