Use the host set in the Ingess field for the OpenShift Route (#2409)

* Use the custom host for OpenShift Routes Signed-off-by: Israel Blancas <iblancasa@gmail.com> * Fix autogenerated content Signed-off-by: Israel Blancas <iblancasa@gmail.com> --------- Signed-off-by: Israel Blancas <iblancasa@gmail.com> Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com> Co-authored-by: Ruben Vargas <ruben.vp8510@gmail.com>
jaegertracing · Mar 7, 2024 · 2583d2a · 2583d2a
1 parent 173ad1e
commit 2583d2a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -369,6 +369,12 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - route.openshift.io
+          resources:
+          - routes/custom-host
+          verbs:
+          - create
         serviceAccountName: jaeger-operator
       deployments:
       - label:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -254,3 +254,9 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes/custom-host
+  verbs:
+  - create
diff --git a/controllers/jaegertracing/jaeger_controller.go b/controllers/jaegertracing/jaeger_controller.go
@@ -50,6 +50,7 @@ func NewReconciler(client client.Client, clientReader client.Reader, scheme *run
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=route.openshift.io,resources=routes/custom-host,verbs=create
 // +kubebuilder:rbac:groups=console.openshift.io,resources=consolelinks,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=batch,resources=jobs;cronjobs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;list;watch;create;update;patch;delete

diff --git a/pkg/route/query.go b/pkg/route/query.go
@@ -36,18 +36,27 @@ func (r *QueryRoute) Get() *corev1.Route {
 	}
 
 	var name string
+
+	host := ""
+	if len(r.jaeger.Spec.Ingress.Hosts) > 0 {
+		host = r.jaeger.Spec.Ingress.Hosts[0]
+	}
+
 	if len(r.jaeger.Namespace) >= 63 {
 		// the route is doomed already, nothing we can do...
 		name = r.jaeger.Name
-		r.jaeger.Logger().V(1).Info(
-			"the route's hostname will have more than 63 chars and will not be valid",
-			"name", name,
-		)
+		if host == "" {
+			r.jaeger.Logger().V(1).Info(
+				"the route's hostname will have more than 63 chars and will not be valid",
+				"name", name,
+			)
+		}
 	} else {
 		// -namespace is added to the host by OpenShift
 		name = util.Truncate(r.jaeger.Name, 62-len(r.jaeger.Namespace))
 	}
 	name = util.DNSName(name)
+
 	return &corev1.Route{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Route",
@@ -78,6 +87,7 @@ func (r *QueryRoute) Get() *corev1.Route {
 			TLS: &corev1.TLSConfig{
 				Termination: termination,
 			},
+			Host: host,
 		},
 	}
 }