Start RayCluster webhook on OpenShift only

Author: astefanutti

main.go

@@ -147,11 +147,21 @@ func main() {
 	})
 	exitOnError(err, "unable to start manager")
 
-	exitOnError(controllers.SetupRayClusterWebhookWithManager(mgr, cfg.KubeRay), "error setting up RayCluster webhook")
+	OpenShift := isOpenShift(ctx, kubeClient.DiscoveryClient)
 
-	ok, err := HasAPIResourceForGVK(kubeClient.DiscoveryClient, rayv1.GroupVersion.WithKind("RayCluster"))
+	if OpenShift {
+		// TODO: setup the RayCluster webhook on vanilla Kubernetes
+		exitOnError(controllers.SetupRayClusterWebhookWithManager(mgr, cfg.KubeRay), "error setting up RayCluster webhook")
+	}
+
+	ok, err := hasAPIResourceForGVK(kubeClient.DiscoveryClient, rayv1.GroupVersion.WithKind("RayCluster"))
 	if ok {
-		rayClusterController := controllers.RayClusterReconciler{Client: mgr.GetClient(), Scheme: mgr.GetScheme(), Config: cfg.KubeRay}
+		rayClusterController := controllers.RayClusterReconciler{
+			Client:      mgr.GetClient(),
+			Scheme:      mgr.GetScheme(),
+			Config:      cfg.KubeRay,
+			IsOpenShift: OpenShift,
+		}
 		exitOnError(rayClusterController.SetupWithManager(mgr), "Error setting up RayCluster controller")
 	} else if err != nil {
 		exitOnError(err, "Could not determine if RayCluster CR present on cluster.")
@@ -207,7 +217,7 @@ func createConfigMap(ctx context.Context, client kubernetes.Interface, ns, name
 	return err
 }
 
-func HasAPIResourceForGVK(dc discovery.DiscoveryInterface, gvk schema.GroupVersionKind) (bool, error) {
+func hasAPIResourceForGVK(dc discovery.DiscoveryInterface, gvk schema.GroupVersionKind) (bool, error) {
 	gv, kind := gvk.ToAPIVersionAndKind()
 	if resources, err := dc.ServerResourcesForGroupVersion(gv); err != nil {
 		if apierrors.IsNotFound(err) {
@@ -247,3 +257,20 @@ func exitOnError(err error, msg string) {
 		os.Exit(1)
 	}
 }
+
+func isOpenShift(ctx context.Context, dc discovery.DiscoveryInterface) bool {
+	logger := ctrl.LoggerFrom(ctx)
+	apiGroupList, err := dc.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
+		}
+	}
+	logger.Info("We detected being on Vanilla Kubernetes!")
+	return false
+}

pkg/controllers/raycluster_controller.go

@@ -48,13 +48,12 @@ import (
 // RayClusterReconciler reconciles a RayCluster object
 type RayClusterReconciler struct {
 	client.Client
-	kubeClient             *kubernetes.Clientset
-	routeClient            *routev1client.RouteV1Client
-	Scheme                 *runtime.Scheme
-	CookieSalt             string
-	Config                 *config.KubeRayConfiguration
-	IsOpenShift            bool
-	IsOpenShiftInitialized bool
+	kubeClient  *kubernetes.Clientset
+	routeClient *routev1client.RouteV1Client
+	Scheme      *runtime.Scheme
+	CookieSalt  string
+	Config      *config.KubeRayConfiguration
+	IsOpenShift bool
 }
 
 const (
@@ -106,11 +105,6 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	if !r.IsOpenShiftInitialized {
-		r.IsOpenShift = isOpenShift(ctx, r.kubeClient, &cluster)
-		r.IsOpenShiftInitialized = true
-	}
-
 	if cluster.ObjectMeta.DeletionTimestamp.IsZero() {
 		if !controllerutil.ContainsFinalizer(&cluster, oAuthFinalizer) {
 			logger.Info("Add a finalizer", "finalizer", oAuthFinalizer)

pkg/controllers/support.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 
@@ -12,10 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	v1 "k8s.io/client-go/applyconfigurations/meta/v1"
 	networkingv1ac "k8s.io/client-go/applyconfigurations/networking/v1"
-	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	ctrl "sigs.k8s.io/controller-runtime"
 
 	routeapply "github.com/openshift/client-go/route/applyconfigurations/route/v1"
 )
@@ -103,41 +99,6 @@ func desiredClusterIngress(cluster *rayv1.RayCluster, ingressHost string) *netwo
 		)
 }
 
-// getDiscoveryClient returns a discovery client for the current reconciler
-func getDiscoveryClient(config *rest.Config) (*discovery.DiscoveryClient, error) {
-	return discovery.NewDiscoveryClientForConfig(config)
-}
-
-// Check where we are running. We are trying to distinguish here whether
-// this is vanilla kubernetes cluster or Openshift
-func isOpenShift(ctx context.Context, clientset *kubernetes.Clientset, cluster *rayv1.RayCluster) bool {
-	// 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 {
-		logger.Info("Cannot retrieve config, assuming we're on Vanilla Kubernetes")
-		return false
-	}
-	dclient, err := getDiscoveryClient(config)
-	if err != nil && dclient == nil {
-		logger.Info("Cannot retrieve a DiscoveryClient, assuming we're on Vanilla Kubernetes")
-		return false
-	}
-	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
-		}
-	}
-	logger.Info("We detected being on Vanilla Kubernetes!")
-	return false
-}
-
 // getIngressHost generates the cluster URL string based on the cluster type, RayCluster, and ingress domain.
 func (r *RayClusterReconciler) getIngressHost(ctx context.Context, clientset *kubernetes.Clientset, cluster *rayv1.RayCluster, ingressNameFromCluster string) (string, error) {
 	ingressDomain := ""