return nil if no svc monitor found

jaideepr97 · jaideepr97 · commit 9d01d0384f5d · 2023-11-22T00:08:38.000+05:30
Signed-off-by: Jaideep Rao &lt;jaideep.r97@gmail.com&gt;
diff --git a/controllers/argocd_metrics_controller.go b/controllers/argocd_metrics_controller.go
@@ -301,6 +301,9 @@ func (r *ArgoCDMetricsReconciler) reconcileOperatorMetricsServiceMonitor(reqLogg
 			reqLogger.Error(err, "Error querying for ServiceMonitor", "Namespace", operatorNS, "Name", operatorMetricsMonitorName)
 			return err
 		}
+
+		// no svc monitor found, nothing to do
+		return nil
 	}
 
 	if existingServiceMonitor.Spec.Endpoints[0].TLSConfig.ServerName != desiredMetricsServerName {

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,9 @@ func (r *ArgoCDMetricsReconciler) reconcileOperatorMetricsServiceMonitor(reqLogg`
`301`	`301`	`reqLogger.Error(err, "Error querying for ServiceMonitor", "Namespace", operatorNS, "Name", operatorMetricsMonitorName)`
`302`	`302`	`return err`
`303`	`303`	`}`
	`304`	`+`
	`305`	`+ // no svc monitor found, nothing to do`
	`306`	`+ return nil`
`304`	`307`	`}`
`305`	`308`
`306`	`309`	`if existingServiceMonitor.Spec.Endpoints[0].TLSConfig.ServerName != desiredMetricsServerName {`