route: Make sure router name is removed from cluster hostname in OCP …

…4.8 (PROJQUAY-2306) - Remove router name prefix from cluster hostname (this happens in OCP 4.8)
quay · Aug 25, 2021 · 654f2c5 · 654f2c5
1 parent ba686da
commit 654f2c5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/controllers/quay/features.go b/controllers/quay/features.go
@@ -130,7 +130,10 @@ func (r *QuayRegistryReconciler) checkRoutesAvailable(ctx *quaycontext.QuayRegis
 
 			if len(fakeRoute.(*routev1.Route).Status.Ingress) > 0 {
 				ctx.SupportsRoutes = true
-				ctx.ClusterHostname = fakeRoute.(*routev1.Route).Status.Ingress[0].RouterCanonicalHostname
+				routerName := fakeRoute.(*routev1.Route).Status.Ingress[0].RouterName
+				routerCanonicalHostname := fakeRoute.(*routev1.Route).Status.Ingress[0].RouterCanonicalHostname
+				ctx.ClusterHostname = strings.TrimPrefix(routerCanonicalHostname, "router-"+routerName+".")
+				r.Log.Info("Detected cluster hostname " + ctx.ClusterHostname)
 
 				return true, nil
 			}