clean comments

Signed-off-by: Coleen Iona Quadros <[email protected]>
stolostron · Oct 18, 2023 · 3370d1c · 3370d1c
1 parent 60f8863
commit 3370d1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...servability/controllers/multiclusterobservability/multiclusterobservability_controller.go b/...servability/controllers/multiclusterobservability/multiclusterobservability_controller.go
@@ -869,7 +869,6 @@ func (r *MultiClusterObservabilityReconciler) deleteSpecificPrometheusRule(ctx c
 	return nil
 }
 
-// Delete the ServiceMonitor in openshift-monitoring namespace
 func (r *MultiClusterObservabilityReconciler) deleteServiceMonitorInOpenshiftMonitoringNamespace(ctx context.Context) error {
 	serviceMonitorList := &monitoringv1.ServiceMonitorList{}
 	err := r.Client.List(ctx, serviceMonitorList, client.InNamespace("openshift-monitoring"))

diff --git a/...bility/controllers/multiclusterobservability/multiclusterobservability_controller_test.go b/...bility/controllers/multiclusterobservability/multiclusterobservability_controller_test.go
@@ -971,6 +971,7 @@ func createPersistentVolumeClaim(name, namespace, pvcName string) *corev1.Persis
 	}
 }
 
+<<<<<<< HEAD
 func newMultiClusterObservability() *mcov1beta2.MultiClusterObservability {
 	return &mcov1beta2.MultiClusterObservability{
 		TypeMeta:   metav1.TypeMeta{Kind: "MultiClusterObservability"},
@@ -1008,6 +1009,8 @@ func createAlertManagerConfigMap(name string) *corev1.ConfigMap {
 }
 
 // Test Prometheus Rules removed from open shift monitoring namespace
+=======
+>>>>>>> ca1cbf5f (clean comments)
 func TestPrometheusRulesRemovedFromOpenshiftMonitoringNamespace(t *testing.T) {
 	promRule := &monitoringv1.PrometheusRule{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1039,7 +1042,6 @@ func TestPrometheusRulesRemovedFromOpenshiftMonitoringNamespace(t *testing.T) {
 	}
 }
 
-// Test Service Monitor removed from open shift monitoring namespace
 func TestServiceMonitorRemovedFromOpenshiftMonitoringNamespace(t *testing.T) {
 	sm := &monitoringv1.ServiceMonitor{
 		ObjectMeta: metav1.ObjectMeta{