Return nil at the end of createScrapeConfigs

vyzigold · vyzigold · commit 96fde2cb11db · 2024-11-27T10:37:05.000-05:00
Currently the function returns the latest value of the "err" variable.
This isn't what should be happening. If we want to return an error,
we should do so in one of the `if err != nil {}` blocks. When
the function gets to the end, it should be considered as
successfuly executed.
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -647,7 +647,7 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
 	}
 
 	instance.Status.Conditions.MarkTrue(telemetryv1.ScrapeConfigReadyCondition, condition.ReadyMessage)
-	return ctrl.Result{}, err
+	return ctrl.Result{}, nil
 }
 
 func getNodeExporterTargets(nodes []ConnectionInfo) ([]metricstorage.LabeledTarget, []metricstorage.LabeledTarget) {

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ func (r *MetricStorageReconciler) createScrapeConfigs(`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`instance.Status.Conditions.MarkTrue(telemetryv1.ScrapeConfigReadyCondition, condition.ReadyMessage)`
`650`		`- return ctrl.Result{}, err`
	`650`	`+ return ctrl.Result{}, nil`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`func getNodeExporterTargets(nodes []ConnectionInfo) ([]metricstorage.LabeledTarget, []metricstorage.LabeledTarget) {`