Addressing comments Never Nester

Author: ChristianZaccaria

pkg/controllers/support.go

@@ -131,37 +131,33 @@ func getClusterType(ctx context.Context, clientset *kubernetes.Clientset, cluste
 	// The discovery package is used to discover APIs supported by a Kubernetes API server.
 	logger := ctrl.LoggerFrom(ctx)
 	config, err := ctrl.GetConfig()
-	if err == nil && config != nil {
-		dclient, err := getDiscoveryClient(config)
-		if err == nil && dclient != nil {
-			apiGroupList, err := dclient.ServerGroups()
-			if err != nil {
-				logger.Info("Error while querying ServerGroups, assuming we're on Vanilla Kubernetes")
-				return false, ""
-			} else {
-				for i := 0; i < len(apiGroupList.Groups); i++ {
-					if strings.HasSuffix(apiGroupList.Groups[i].Name, ".openshift.io") {
-						logger.Info("We detected being on OpenShift!")
-						return true, ""
-					}
-				}
-				onKind, _ := isOnKindCluster(clientset)
-				if onKind && ingressDomain == "" {
-					logger.Info("We detected being on a KinD cluster!")
-					return false, "kind"
-				} else {
-					logger.Info("We detected being on Vanilla Kubernetes!")
-					return false, fmt.Sprintf("ray-dashboard-%s-%s.%s", cluster.Name, cluster.Namespace, ingressDomain)
-				}
-			}
-		} else {
-			logger.Info("Cannot retrieve a DiscoveryClient, assuming we're on Vanilla Kubernetes")
-			return false, fmt.Sprintf("ray-dashboard-%s-%s.%s", cluster.Name, cluster.Namespace, ingressDomain)
-		}
-	} else {
+	if err != nil && config == nil {
 		logger.Info("Cannot retrieve config, assuming we're on Vanilla Kubernetes")
 		return false, fmt.Sprintf("ray-dashboard-%s-%s.%s", cluster.Name, cluster.Namespace, ingressDomain)
 	}
+	dclient, err := getDiscoveryClient(config)
+	if err != nil && dclient == nil {
+		logger.Info("Cannot retrieve a DiscoveryClient, assuming we're on Vanilla Kubernetes")
+		return false, fmt.Sprintf("ray-dashboard-%s-%s.%s", cluster.Name, cluster.Namespace, ingressDomain)
+	}
+	apiGroupList, err := dclient.ServerGroups()
+	if err != nil {
+		logger.Info("Error while querying ServerGroups, assuming we're on Vanilla Kubernetes")
+		return false, ""
+	}
+	for i := 0; i < len(apiGroupList.Groups); i++ {
+		if strings.HasSuffix(apiGroupList.Groups[i].Name, ".openshift.io") {
+			logger.Info("We detected being on OpenShift!")
+			return true, ""
+		}
+	}
+	onKind, _ := isOnKindCluster(clientset)
+	if onKind && ingressDomain == "" {
+		logger.Info("We detected being on a KinD cluster!")
+		return false, "kind"
+	}
+	logger.Info("We detected being on Vanilla Kubernetes!")
+	return false, fmt.Sprintf("ray-dashboard-%s-%s.%s", cluster.Name, cluster.Namespace, ingressDomain)
 }
 
 func (r *RayClusterReconciler) isRayDashboardOAuthEnabled() bool {