Refactor conditions

MuneebAijaz · MuneebAijaz · commit 1752499c490f · 2022-11-09T19:06:49.000+05:00
diff --git a/pkg/kube/util/url.go b/pkg/kube/util/url.go
@@ -69,12 +69,10 @@ func discoverURLFromRefs(client client.Client, ingressMonitor *endpointmonitorv1
 		// if routeRef is mentioned in openshift cluster
 		return discoverURLFromRouteRef(client, urlFrom.RouteRef, ingressMonitor.Namespace, ingressMonitor.Spec.ForceHTTPS, ingressMonitor.Spec.HealthEndpoint)
 
-	} else if !kube.IsOpenshift && urlFrom.RouteRef != nil {
-		// if routeRef is mentioned in non openshift cluster
-		log.V(1).Info("RouteRef is mentioned in kubernetes version: " + ingressMonitor.Name)
-
 	}
 
-	log.V(1).Info("Unsupported Ref set on ingressMonitor: " + ingressMonitor.Name)
+	// if routeRef is mentioned in non openshift cluster
+	log.V(1).Info("RouteRef is not supported for kubernetes version: " + ingressMonitor.Name)
+
 	return "", errors.New("Unsupported Ref set on ingressMonitor: " + ingressMonitor.Name)
 }

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,10 @@ func discoverURLFromRefs(client client.Client, ingressMonitor *endpointmonitorv1`
`69`	`69`	`// if routeRef is mentioned in openshift cluster`
`70`	`70`	`return discoverURLFromRouteRef(client, urlFrom.RouteRef, ingressMonitor.Namespace, ingressMonitor.Spec.ForceHTTPS, ingressMonitor.Spec.HealthEndpoint)`
`71`	`71`
`72`		`- } else if !kube.IsOpenshift && urlFrom.RouteRef != nil {`
`73`		`- // if routeRef is mentioned in non openshift cluster`
`74`		`- log.V(1).Info("RouteRef is mentioned in kubernetes version: " + ingressMonitor.Name)`
`75`		`-`
`76`	`72`	`}`
`77`	`73`
`78`		`- log.V(1).Info("Unsupported Ref set on ingressMonitor: " + ingressMonitor.Name)`
	`74`	`+ // if routeRef is mentioned in non openshift cluster`
	`75`	`+ log.V(1).Info("RouteRef is not supported for kubernetes version: " + ingressMonitor.Name)`
	`76`	`+`
`79`	`77`	`return "", errors.New("Unsupported Ref set on ingressMonitor: " + ingressMonitor.Name)`
`80`	`78`	`}`