Merge pull request #242 from fluxcd/rev-change-event-panic

hiddeco · web-flow · commit 72e00e82c03d · 2020-12-16T15:43:13.000+01:00
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -188,8 +188,8 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	}
 
 	// Emit an event if we did not have an artifact before, or the revision has changed
-	if (chart.Status.Artifact == nil && reconciledChart.Status.Artifact != nil) ||
-		reconciledChart.Status.Artifact.Revision != chart.Status.Artifact.Revision {
+	if (chart.GetArtifact() == nil && reconciledChart.GetArtifact() != nil) ||
+		(chart.GetArtifact() != nil && reconciledChart.GetArtifact() != nil && reconciledChart.GetArtifact().Revision != chart.GetArtifact().Revision) {
 		r.event(reconciledChart, events.EventSeverityInfo, sourcev1.HelmChartReadyMessage(reconciledChart))
 	}
 	r.recordReadiness(reconciledChart)

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,8 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`// Emit an event if we did not have an artifact before, or the revision has changed`
`191`		`- if (chart.Status.Artifact == nil && reconciledChart.Status.Artifact != nil) \|\|`
`192`		`- reconciledChart.Status.Artifact.Revision != chart.Status.Artifact.Revision {`
	`191`	`+ if (chart.GetArtifact() == nil && reconciledChart.GetArtifact() != nil) \|\|`
	`192`	`+ (chart.GetArtifact() != nil && reconciledChart.GetArtifact() != nil && reconciledChart.GetArtifact().Revision != chart.GetArtifact().Revision) {`
`193`	`193`	`r.event(reconciledChart, events.EventSeverityInfo, sourcev1.HelmChartReadyMessage(reconciledChart))`
`194`	`194`	`}`
`195`	`195`	`r.recordReadiness(reconciledChart)`