From 70332d85e2b1a96f88caaadb3c0cff435cc7ad7d Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Fri, 28 Jun 2024 16:59:41 +0200 Subject: [PATCH] fix: add odh-modle-controller NWP to whitelist (#1087) Signed-off-by: Wen Zhou --- .../datasciencecluster/datasciencecluster_controller.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go index e19c3a695b6..03abc68ccb5 100644 --- a/controllers/datasciencecluster/datasciencecluster_controller.go +++ b/controllers/datasciencecluster/datasciencecluster_controller.go @@ -403,6 +403,13 @@ var modelMeshRolePredicates = predicate.Funcs{ }, } +// a workaround for modelmesh and kserve both create same odh-model-controller NWP. +var networkpolicyPredicates = predicate.Funcs{ + UpdateFunc: func(e event.UpdateEvent) bool { + return e.ObjectNew.GetName() != "odh-model-controller" + }, +} + var modelMeshRBPredicates = predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { notAllowedNames := []string{"leader-election-rolebinding", "proxy-rolebinding", "odh-model-controller-rolebinding-opendatahub"} @@ -432,7 +439,7 @@ func (r *DataScienceClusterReconciler) SetupWithManager(ctx context.Context, mgr Owns(&corev1.Namespace{}). Owns(&corev1.Secret{}). Owns(&corev1.ConfigMap{}, builder.WithPredicates(configMapPredicates)). - Owns(&networkingv1.NetworkPolicy{}). + Owns(&networkingv1.NetworkPolicy{}, builder.WithPredicates(networkpolicyPredicates)). Owns(&rbacv1.Role{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, modelMeshRolePredicates))). Owns(&rbacv1.RoleBinding{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, modelMeshRBPredicates))). Owns(&rbacv1.ClusterRole{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, modelMeshRolePredicates))).