Show actual log during custom wait rule if asked specifically

Signed-off-by: Rohit Aggarwal <[email protected]>
carvel-dev · Dec 8, 2024 · ac0ceea · ac0ceea
1 parent 52d3484
commit ac0ceea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/kapp/config/config.go b/pkg/kapp/config/config.go
@@ -57,6 +57,7 @@ type WaitRuleConditionMatcher struct {
 	SupportsObservedGeneration bool
 	UnblockChanges             bool
 	Timeout                    string
+	ShowActualMessage          bool
 }
 
 type WaitRuleYtt struct {

diff --git a/pkg/kapp/resourcesmisc/custom_waiting_resource.go b/pkg/kapp/resourcesmisc/custom_waiting_resource.go
@@ -131,6 +131,7 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
 	}
 
 	unblockChangeMsg := ""
+	actualMsg := "No failing or successful conditions found"
 
 	// If no failure conditions found, check on successful ones
 	for _, condMatcher := range s.waitRule.ConditionMatchers {
@@ -151,6 +152,9 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
 						cond.Type, condMatcher.Status, cond.Reason)
 					continue
 				}
+				if condMatcher.ShowActualMessage && cond.Message != "" {
+					actualMsg = cond.Message
+				}
 			}
 		}
 	}
@@ -164,7 +168,7 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
 		return DoneApplyState{Done: false, UnblockChanges: true, Message: unblockChangeMsg}
 	}
 
-	return DoneApplyState{Done: false, Message: "No failing or successful conditions found"}
+	return DoneApplyState{Done: false, Message: actualMsg}
 }
 
 func (s CustomWaitingResource) hasTimeoutOccurred(timeout string, key string) bool {