From 7e79f0fc59c29db4bda65d519dcbabb4979b1e3b Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Thu, 31 Oct 2024 10:11:43 +0100 Subject: [PATCH] update: remove ingresscontroller from owns/watches Signed-off-by: Wen Zhou --- .../datasciencecluster_controller.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go index 8f0e2930c40..454d6f084d8 100644 --- a/controllers/datasciencecluster/datasciencecluster_controller.go +++ b/controllers/datasciencecluster/datasciencecluster_controller.go @@ -532,25 +532,20 @@ func (r *DataScienceClusterReconciler) SetupWithManager(ctx context.Context, mgr }), builder.WithPredicates(argoWorkflowCRDPredicates), ). - Watches( // ingresscontroller - &networkingv1.Ingress{}, - handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request { - return r.watchDefaultIngressSecret(ctx, a) - }), - ). Watches( // ingress &configv1.Ingress{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request { return r.watchIngressResources(ctx, a) }), - builder.WithPredicates(updatePredicates), + builder.WithPredicates(generalUpdatePredicates), ). Watches( &corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request { return r.watchDefaultIngressSecret(ctx, a) }), - builder.WithPredicates(defaultIngressCertSecretPredicates)). + builder.WithPredicates(defaultIngressCertSecretPredicates), + ). // this predicates prevents meaningless reconciliations from being triggered WithEventFilter(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{})). Complete(r) @@ -659,7 +654,7 @@ func (r *DataScienceClusterReconciler) watchIngressResources(ctx context.Context }} } -var updatePredicates = predicate.Funcs{ +var generalUpdatePredicates = predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { return true },