Add OAuth config to reconciler struct

Author: ChristianZaccaria

main.go

@@ -185,7 +185,7 @@ func main() {
 
 	v, err := HasAPIResourceForGVK(kubeClient.DiscoveryClient, rayv1.GroupVersion.WithKind("RayCluster"))
 	if v {
-		rayClusterController := controllers.RayClusterReconciler{Client: mgr.GetClient(), Scheme: mgr.GetScheme()}
+		rayClusterController := controllers.RayClusterReconciler{Client: mgr.GetClient(), Scheme: mgr.GetScheme(), Config: cfg}
 		exitOnError(rayClusterController.SetupWithManager(mgr), "Error setting up RayCluster controller")
 	} else if err != nil {
 		exitOnError(err, "Could not determine if RayCluster CR present on cluster.")

pkg/controllers/raycluster_controller.go

@@ -52,6 +52,7 @@ type RayClusterReconciler struct {
 	routeClient *routev1client.RouteV1Client
 	Scheme      *runtime.Scheme
 	CookieSalt  string
+	Config      *config.CodeFlareOperatorConfiguration
 }
 
 const (
@@ -60,14 +61,13 @@ const (
 	oAuthFinalizer         = "ray.openshift.ai/oauth-finalizer"
 	oAuthServicePort       = 443
 	oAuthServicePortName   = "oauth-proxy"
-	regularServicePortName = "dashboard"
+	ingressServicePortName = "dashboard"
 	logRequeueing          = "requeueing"
 )
 
 var (
-	deletePolicy   = metav1.DeletePropagationForeground
-	deleteOptions  = client.DeleteOptions{PropagationPolicy: &deletePolicy}
-	configInstance *config.CodeFlareOperatorConfiguration
+	deletePolicy  = metav1.DeletePropagationForeground
+	deleteOptions = client.DeleteOptions{PropagationPolicy: &deletePolicy}
 )
 
 // +kubebuilder:rbac:groups=ray.io,resources=rayclusters,verbs=get;list;watch;create;update;patch;delete
@@ -103,7 +103,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	isLocalInteractive := annotationBoolVal(logger, &cluster, "sdk.codeflare.dev/local_interactive")
 	isOpenShift, ingressHost := getClusterType(logger, r.kubeClient, &cluster)
-	ingressDomain := cluster.ObjectMeta.Annotations["sdk.codeflare.dev/ingress_domain"]
+	ingressDomain := getIngressDomain(&cluster)
 
 	if cluster.ObjectMeta.DeletionTimestamp.IsZero() {
 		if !controllerutil.ContainsFinalizer(&cluster, oAuthFinalizer) {
@@ -138,7 +138,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
-	if cluster.Status.State != "suspended" && isRayDashboardOAuthEnabled() && isOpenShift {
+	if cluster.Status.State != "suspended" && r.isRayDashboardOAuthEnabled() && isOpenShift {
 		logger.Info("Creating OAuth Objects")
 		_, err := r.routeClient.Routes(cluster.Namespace).Apply(ctx, desiredClusterRoute(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
@@ -165,22 +165,15 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			logger.Error(err, "Failed to update OAuth ClusterRoleBinding")
 		}
 
-	} else if cluster.Status.State != "suspended" && !isRayDashboardOAuthEnabled() && isOpenShift {
-		logger.Info("Creating Dashboard Route")
-		_, err := r.routeClient.Routes(cluster.Namespace).Apply(ctx, createRoute(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
-		if err != nil {
-			logger.Error(err, "Failed to update Dashboard Route")
-		}
 		if isLocalInteractive && ingressDomain != "" {
 			logger.Info("Creating RayClient Route")
 			_, err := r.routeClient.Routes(cluster.Namespace).Apply(ctx, createRayClientRoute(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 			if err != nil {
 				logger.Error(err, "Failed to update RayClient Route")
 			}
 		}
-		return ctrl.Result{}, nil
 
-	} else if cluster.Status.State != "suspended" && !isRayDashboardOAuthEnabled() && !isOpenShift {
+	} else if cluster.Status.State != "suspended" && !r.isRayDashboardOAuthEnabled() && !isOpenShift {
 		logger.Info("Creating Dashboard Ingress")
 		_, err := r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, createIngressApplyConfiguration(&cluster, ingressHost), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {

pkg/controllers/support.go

@@ -27,20 +27,6 @@ func serviceNameFromCluster(cluster *rayv1.RayCluster) string {
 	return cluster.Name + "-head-svc"
 }
 
-func createRoute(cluster *rayv1.RayCluster) *routeapply.RouteApplyConfiguration {
-	return routeapply.Route(dashboardNameFromCluster(cluster), cluster.Namespace).
-		WithLabels(map[string]string{"ray.io/cluster-name": cluster.Name}).
-		WithSpec(routeapply.RouteSpec().
-			WithTo(routeapply.RouteTargetReference().WithKind("Service").WithName(serviceNameFromCluster(cluster))).
-			WithPort(routeapply.RoutePort().WithTargetPort(intstr.FromString(regularServicePortName))).
-			WithTLS(routeapply.TLSConfig().
-				WithTermination("edge")),
-		).
-		WithOwnerReferences(
-			v1.OwnerReference().WithUID(cluster.UID).WithName(cluster.Name).WithKind(cluster.Kind).WithAPIVersion(cluster.APIVersion),
-		)
-}
-
 func createRayClientRoute(cluster *rayv1.RayCluster) *routeapply.RouteApplyConfiguration {
 	ingress_domain := cluster.ObjectMeta.Annotations["sdk.codeflare.dev/ingress_domain"]
 	return routeapply.Route(rayClientNameFromCluster(cluster), cluster.Namespace).
@@ -113,7 +99,7 @@ func createIngressApplyConfiguration(cluster *rayv1.RayCluster, ingressHost stri
 							WithService(networkingv1ac.IngressServiceBackend().
 								WithName(serviceNameFromCluster(cluster)).
 								WithPort(networkingv1ac.ServiceBackendPort().
-									WithName(regularServicePortName),
+									WithName(ingressServicePortName),
 								),
 							),
 						),
@@ -180,22 +166,29 @@ func getClusterType(logger logr.Logger, clientset *kubernetes.Clientset, cluster
 	}
 }
 
-func isRayDashboardOAuthEnabled() bool {
-	if configInstance.KubeRay != nil && configInstance.KubeRay.RayDashboardOAuthEnabled != nil {
-		return *configInstance.KubeRay.RayDashboardOAuthEnabled
+func (r *RayClusterReconciler) isRayDashboardOAuthEnabled() bool {
+	if r.Config != nil && r.Config.KubeRay != nil && r.Config.KubeRay.RayDashboardOAuthEnabled != nil {
+		return *r.Config.KubeRay.RayDashboardOAuthEnabled
 	}
 	return true
 }
 
 func annotationBoolVal(logger logr.Logger, cluster *rayv1.RayCluster, annotation string) bool {
-	val := cluster.ObjectMeta.Annotations[annotation]
+	val, exists := cluster.ObjectMeta.Annotations[annotation]
+	if !exists || val == "" {
+		return false
+	}
 	boolVal, err := strconv.ParseBool(val)
 	if err != nil {
-		logger.Error(err, "Could not convert", annotation, "value to bool", val)
-	}
-	if boolVal {
-		return true
-	} else {
+		logger.Error(err, "Could not convert annotation value to bool", "annotation", annotation, "value", val)
 		return false
 	}
+	return boolVal
+}
+
+func getIngressDomain(cluster *rayv1.RayCluster) string {
+	if ingressDomain, exists := cluster.ObjectMeta.Annotations["sdk.codeflare.dev/ingress_domain"]; exists {
+		return ingressDomain
+	}
+	return ""
 }