Skip to content

Commit 99a1713

Browse files
authored
include error in msg from healthchecker (#296)
Signed-off-by: Tesshu Flower <[email protected]>
1 parent 4217c03 commit 99a1713

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

pkg/addonmanager/controllers/agentdeploy/healthcheck_sync.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,16 @@ func (s *healthCheckSyncer) probeAddonStatusByWorks(
227227

228228
}
229229

230-
if healthChecker != nil && healthChecker(FieldResults, cluster, addon) != nil {
231-
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{
232-
Type: addonapiv1alpha1.ManagedClusterAddOnConditionAvailable,
233-
Status: metav1.ConditionFalse,
234-
Reason: addonapiv1alpha1.AddonAvailableReasonProbeUnavailable,
235-
Message: fmt.Sprintf("Probe addon unavailable with err %v", err),
236-
})
237-
return nil
230+
if healthChecker != nil {
231+
if err := healthChecker(FieldResults, cluster, addon); err != nil {
232+
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{
233+
Type: addonapiv1alpha1.ManagedClusterAddOnConditionAvailable,
234+
Status: metav1.ConditionFalse,
235+
Reason: addonapiv1alpha1.AddonAvailableReasonProbeUnavailable,
236+
Message: fmt.Sprintf("Probe addon unavailable with err %v", err),
237+
})
238+
return nil
239+
}
238240
}
239241

240242
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{

0 commit comments

Comments
 (0)