Merge pull request #550 from vyzigold/fix_kuttl_tests

openshift-merge-bot[bot] · web-flow · commit 4b7330f4e7eb · 2024-11-29T07:43:36.000Z
Return nil at the end of createScrapeConfigs
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) {`