Address comments on returning

Author: ChristianZaccaria

pkg/controllers/raycluster_controller.go

@@ -143,33 +143,39 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		_, err := r.routeClient.Routes(cluster.Namespace).Apply(ctx, desiredClusterRoute(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to update OAuth Route")
+			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 
 		_, err = r.kubeClient.CoreV1().Secrets(cluster.Namespace).Apply(ctx, desiredOAuthSecret(&cluster, r), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to create OAuth Secret")
+			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 
 		_, err = r.kubeClient.CoreV1().Services(cluster.Namespace).Apply(ctx, desiredOAuthService(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to update OAuth Service")
+			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 
 		_, err = r.kubeClient.CoreV1().ServiceAccounts(cluster.Namespace).Apply(ctx, desiredServiceAccount(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to update OAuth ServiceAccount")
+			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 
 		_, err = r.kubeClient.RbacV1().ClusterRoleBindings().Apply(ctx, desiredOAuthClusterRoleBinding(&cluster), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 		if err != nil {
 			logger.Error(err, "Failed to update OAuth ClusterRoleBinding")
+			return ctrl.Result{RequeueAfter: requeueTime}, err
 		}
 
 		if isLocalInteractive && ingressDomain != "" {
 			logger.Info("Creating RayClient Route")
 			_, err := r.routeClient.Routes(cluster.Namespace).Apply(ctx, createRayClientRoute(&cluster, ingressDomain), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 			if err != nil {
 				logger.Error(err, "Failed to update RayClient Route")
+				return ctrl.Result{RequeueAfter: requeueTime}, err
 			}
 		}
 
@@ -179,15 +185,16 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		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
 		}
 		if isLocalInteractive && ingressDomain != "" {
 			logger.Info("Creating RayClient Ingress")
 			_, err := r.kubeClient.NetworkingV1().Ingresses(cluster.Namespace).Apply(ctx, createRayClientIngress(&cluster, ingressDomain), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 			if err != nil {
 				logger.Error(err, "Failed to update RayClient Ingress")
+				return ctrl.Result{RequeueAfter: requeueTime}, err
 			}
 		}
-		return ctrl.Result{}, nil
 	}
 
 	return ctrl.Result{}, nil