use jumpstarter.namespace.domain

Author: evakhoni

deploy/operator/internal/controller/jumpstarter/endpoints/discovery.go

@@ -18,7 +18,6 @@ package endpoints
 
 import (
 	"context"
-	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -89,10 +88,8 @@ func detectOpenShiftBaseDomain(config *rest.Config) string {
 		return ""
 	}
 
-	// Add jumpstarter prefix to the cluster's apps domain
-	baseDomain := fmt.Sprintf("jumpstarter.%s", domain)
-	logger.Info("Auto-detected OpenShift baseDomain", "clusterDomain", domain, "baseDomain", baseDomain)
-	return baseDomain
+	logger.Info("Auto-detected OpenShift cluster domain", "domain", domain)
+	return domain
 }
 
 // unstructuredNestedString extracts a nested string from an unstructured object

deploy/operator/internal/controller/jumpstarter/endpoints/endpoints.go

@@ -71,12 +71,11 @@ func NewReconciler(client client.Client, scheme *runtime.Scheme, config *rest.Co
 
 // ApplyDefaults applies endpoint defaults to a JumpstarterSpec using the
 // reconciler's discovered cluster capabilities (Route vs Ingress availability).
-// If baseDomain is not provided in the spec, it will use the default baseDomain
-// (auto-detected from OpenShift cluster config) if available.
-func (r *Reconciler) ApplyDefaults(spec *operatorv1alpha1.JumpstarterSpec) {
-	// Use default baseDomain if not provided in spec
+// If baseDomain is not provided in the spec, it will generate one using the pattern
+// jumpstarter.$namespace.$clusterDomain (auto-detected from OpenShift cluster config).
+func (r *Reconciler) ApplyDefaults(spec *operatorv1alpha1.JumpstarterSpec, namespace string) {
 	if spec.BaseDomain == "" && r.DefaultBaseDomain != "" {
-		spec.BaseDomain = r.DefaultBaseDomain
+		spec.BaseDomain = fmt.Sprintf("jumpstarter.%s.%s", namespace, r.DefaultBaseDomain)
 	}
 	ApplyEndpointDefaults(spec, r.RouteAvailable, r.IngressAvailable)
 }

deploy/operator/internal/controller/jumpstarter/jumpstarter_controller.go

@@ -133,7 +133,7 @@ func (r *JumpstarterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Apply runtime-computed defaults (endpoints based on baseDomain and cluster capabilities)
 	// Static defaults are handled by kubebuilder annotations in the CRD schema
-	r.EndpointReconciler.ApplyDefaults(&jumpstarter.Spec)
+	r.EndpointReconciler.ApplyDefaults(&jumpstarter.Spec, jumpstarter.Namespace)
 
 	// Reconcile RBAC resources first
 	if err := r.reconcileRBAC(ctx, &jumpstarter); err != nil {