reset status.healthy in each reconcile (kubernetes-sigs#318)

yuwenma · web-flow · commit d7a278a209a8 · 2023-03-16T18:45:15.000-07:00
* reset status.healthy in each reconcile

* simpler status.healthy
diff --git a/pkg/patterns/addon/pkg/status/kstatus.go b/pkg/patterns/addon/pkg/status/kstatus.go
@@ -30,7 +30,6 @@ func (k *kstatusAggregator) BuildStatus(ctx context.Context, info *declarative.S
 
 	shouldComputeHealthFromObjects := info.Manifest != nil && info.LiveObjects != nil
 	if info.Err != nil {
-		currentStatus.Healthy = false
 		switch info.KnownError {
 		case declarative.KnownErrorApplyFailed:
 			currentStatus.Phase = "Applying"
@@ -88,7 +87,7 @@ func (k *kstatusAggregator) BuildStatus(ctx context.Context, info *declarative.S
 		}
 		currentStatus.Phase = string(aggregatedPhase)
 	}
-
+	currentStatus.Healthy = currentStatus.Phase == string(status.CurrentStatus)
 	if err := utils.SetCommonStatus(info.Subject, currentStatus); err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ func (k kstatusAggregator) BuildStatus(ctx context.Context, info declarative.S`
`30`	`30`
`31`	`31`	`shouldComputeHealthFromObjects := info.Manifest != nil && info.LiveObjects != nil`
`32`	`32`	`if info.Err != nil {`
`33`		`- currentStatus.Healthy = false`
`34`	`33`	`switch info.KnownError {`
`35`	`34`	`case declarative.KnownErrorApplyFailed:`
`36`	`35`	`currentStatus.Phase = "Applying"`
`@@ -88,7 +87,7 @@ func (k kstatusAggregator) BuildStatus(ctx context.Context, info declarative.S`
`88`	`87`	`}`
`89`	`88`	`currentStatus.Phase = string(aggregatedPhase)`
`90`	`89`	`}`
`91`		`-`
	`90`	`+ currentStatus.Healthy = currentStatus.Phase == string(status.CurrentStatus)`
`92`	`91`	`if err := utils.SetCommonStatus(info.Subject, currentStatus); err != nil {`
`93`	`92`	`return err`
`94`	`93`	`}`