Merge pull request #219 from ordovicia/emit-healthcheck-when-was-unready

stefanprodan · web-flow · commit b7db5cb6abd8 · 2020-12-17T11:06:06.000+02:00
Emit healthcheck event when Kustomization was not ready
diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go
@@ -815,7 +815,10 @@ func (r *KustomizationReconciler) checkHealth(statusPoller *polling.StatusPoller
 		return err
 	}
 
-	if kustomization.Status.LastAppliedRevision != revision && changed {
+	readiness := apimeta.FindStatusCondition(kustomization.Status.Conditions, meta.ReadyCondition)
+	ready := readiness != nil && readiness.Status == metav1.ConditionTrue
+
+	if !ready || (kustomization.Status.LastAppliedRevision != revision && changed) {
 		r.event(kustomization, revision, events.EventSeverityInfo, "Health check passed", nil)
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,10 @@ func (r KustomizationReconciler) checkHealth(statusPoller polling.StatusPoller`
`815`	`815`	`return err`
`816`	`816`	`}`
`817`	`817`
`818`		`- if kustomization.Status.LastAppliedRevision != revision && changed {`
	`818`	`+ readiness := apimeta.FindStatusCondition(kustomization.Status.Conditions, meta.ReadyCondition)`
	`819`	`+ ready := readiness != nil && readiness.Status == metav1.ConditionTrue`
	`820`	`+`
	`821`	`+ if !ready \|\| (kustomization.Status.LastAppliedRevision != revision && changed) {`
`819`	`822`	`r.event(kustomization, revision, events.EventSeverityInfo, "Health check passed", nil)`
`820`	`823`	`}`
`821`	`824`	`return nil`