Merge pull request kubernetes#455 from ZYecho/fix_newmessage

fix: print result's message when status unknown
linxiulei · Nov 25, 2020 · 1e917af · 1e917af
2 parents 6956e60 + b51cb32
commit 1e917af
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/custompluginmonitor/custom_plugin_monitor.go b/pkg/custompluginmonitor/custom_plugin_monitor.go
@@ -188,9 +188,10 @@ func (c *customPluginMonitor) generateStatus(result cpmtypes.Result) *types.Stat
 				if condition.Status == types.True && status != types.True {
 					// Scenario 1: Condition status changes from True to False/Unknown
 					newReason = defaultConditionReason
-					if newMessage == "" {
+					if status == types.False {
 						newMessage = defaultConditionMessage
 					} else {
+						// When status unknown, the result's message is important for debug
 						newMessage = result.Message
 					}
 				} else if condition.Status != types.True && status == types.True {
@@ -200,9 +201,10 @@ func (c *customPluginMonitor) generateStatus(result cpmtypes.Result) *types.Stat
 				} else if condition.Status != status {
 					// Scenario 3: Condition status changes from False to Unknown or vice versa
 					newReason = defaultConditionReason
-					if newMessage == "" {
+					if status == types.False {
 						newMessage = defaultConditionMessage
 					} else {
+						// When status unknown, the result's message is important for debug
 						newMessage = result.Message
 					}
 				} else if condition.Status == types.True && status == types.True &&