Return error message if IngressDomain configuration not set

Author: ChristianZaccaria

main.go

@@ -115,7 +115,7 @@ func main() {
 		},
 		KubeRay: &config.KubeRayConfiguration{
 			RayDashboardOAuthEnabled: pointer.Bool(true),
-			IngressDomain:            "fake.domain",
+			IngressDomain:            "",
 		},
 	}
 

pkg/config/config.go

@@ -34,7 +34,7 @@ type CodeFlareOperatorConfiguration struct {
 type KubeRayConfiguration struct {
 	RayDashboardOAuthEnabled *bool `json:"rayDashboardOAuthEnabled,omitempty"`
 
-	IngressDomain string `json:"ingressDomain,omitempty"`
+	IngressDomain string `json:"ingressDomain"`
 }
 
 type ControllerManager struct {

pkg/controllers/raycluster_controller.go

@@ -187,15 +187,23 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		logger.Info("We detected being on Vanilla Kubernetes!")
 		logger.Info("Creating Dashboard Ingress")
 		dashboardName := dashboardNameFromCluster(&cluster)
-		_, err := r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, desiredClusterIngress(&cluster, r.getIngressHost(ctx, r.kubeClient, &cluster, dashboardName)), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
+		dashboardIngressHost, err := r.getIngressHost(ctx, r.kubeClient, &cluster, dashboardName)
+		if err != nil {
+			return ctrl.Result{RequeueAfter: requeueTime}, err
+		}
+		_, err = r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, desiredClusterIngress(&cluster, dashboardIngressHost), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			// This log is info level since errors are not fatal and are expected
 			logger.Info("WARN: Failed to update Dashboard Ingress", "error", err.Error(), logRequeueing, true)
 			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 		logger.Info("Creating RayClient Ingress")
 		rayClientName := rayClientNameFromCluster(&cluster)
-		_, err = r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, desiredRayClientIngress(&cluster, r.getIngressHost(ctx, r.kubeClient, &cluster, rayClientName)), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
+		rayClientIngressHost, err := r.getIngressHost(ctx, r.kubeClient, &cluster, rayClientName)
+		if err != nil {
+			return ctrl.Result{RequeueAfter: requeueTime}, err
+		}
+		_, err = r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, desiredRayClientIngress(&cluster, rayClientIngressHost), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to update RayClient Ingress")
 			return ctrl.Result{RequeueAfter: requeueTime}, err

pkg/controllers/support.go

@@ -139,15 +139,17 @@ func isOpenShift(ctx context.Context, clientset *kubernetes.Clientset, cluster *
 }
 
 // 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 {
-	ingressDomain := "fake.domain"
+func (r *RayClusterReconciler) getIngressHost(ctx context.Context, clientset *kubernetes.Clientset, cluster *rayv1.RayCluster, ingressNameFromCluster string) (string, error) {
+	ingressDomain := ""
 	if r.Config != nil && r.Config.IngressDomain != "" {
 		ingressDomain = r.Config.IngressDomain
+	} else {
+		return "", fmt.Errorf("missing IngressDomain configuration in ConfigMap 'codeflare-operator-config'")
 	}
 	if ingressDomain == "kind" {
-		return ingressDomain
+		return ingressDomain, nil
 	}
-	return fmt.Sprintf("%s-%s.%s", ingressNameFromCluster, cluster.Namespace, ingressDomain)
+	return fmt.Sprintf("%s-%s.%s", ingressNameFromCluster, cluster.Namespace, ingressDomain), nil
 }
 
 func (r *RayClusterReconciler) isRayDashboardOAuthEnabled() bool {