Handling passthrough route zenfrontdoor (#1012)

* handling passthrough route zenfrontdoor

* handling passthrough route zenfrontdoor

Signed-off-by: Ujjwal Chakraborty <[email protected]>

* handling passthrough route zenfrontdoor

Signed-off-by: Ujjwal Chakraborty <[email protected]>

* handling passthrough route zenfrontdoor

Signed-off-by: Ujjwal Chakraborty <[email protected]>

---------

Signed-off-by: Ujjwal Chakraborty <[email protected]>
Co-authored-by: Ujjwal Chakraborty <[email protected]>

Author: ujjwalchk-it

controllers/operator/routes.go

@@ -321,8 +321,10 @@ func (r *AuthenticationReconciler) reconcileRoute(authCR *operatorv1alpha1.Authe
 		reqLogger.Info("Reconciling route", "annotations", fields.Annotations, "routeHost", fields.RouteHost, "routePath", fields.RoutePath)
 
 		fCtx := logf.IntoContext(ctx, reqLogger)
-		if shouldNotHaveRoutes(authCR, &r.DiscoveryClient) {
-			return r.ensureRouteDoesNotExist(fCtx, authCR, fields)
+		if fields.Name != IMCrtAuthRouteName {
+			if shouldNotHaveRoutes(authCR, &r.DiscoveryClient) {
+				return r.ensureRouteDoesNotExist(fCtx, authCR, fields)
+			}
 		}
 
 		return r.ensureRouteExists(fCtx, authCR, fields)
@@ -331,10 +333,6 @@ func (r *AuthenticationReconciler) reconcileRoute(authCR *operatorv1alpha1.Authe
 
 func (r *AuthenticationReconciler) ensureRouteDoesNotExist(ctx context.Context, authCR *operatorv1alpha1.Authentication, fields *reconcileRouteFields) (result *ctrl.Result, err error) {
 	reqLogger := logf.FromContext(ctx)
-	if fields.Name == IMCrtAuthRouteName {
-		//do not delete certAuth route
-		return subreconciler.ContinueReconciling()
-	}
 	reqLogger.Info("Determined Route should not exist; removing if present")
 	observedRoute := &routev1.Route{}
 	err = r.Get(ctx, types.NamespacedName{Name: fields.Name, Namespace: authCR.Namespace}, observedRoute)

controllers/operator/routes_test.go

@@ -858,7 +858,8 @@ var _ = Describe("Route handling", func() {
 			}
 			err = r.List(ctx, routes, listOpts...)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(routes.Items).To(HaveLen(0))
+			Expect(routes.Items).To(HaveLen(1))
+			Expect(routes.Items[0].Name).To(Equal(IMCrtAuthRouteName))
 		})
 
 		It("updates all Routes when differences are found and requeues", func() {