refactor: remove duplicate IsCrossNamespaceImportAllowed

grafana · Jan 27, 2025 · b79554d · b79554d
1 parent feeee41
commit b79554d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/api/v1beta1/grafananotificationpolicy_types.go b/api/v1beta1/grafananotificationpolicy_types.go
@@ -178,11 +178,6 @@ func (np *GrafanaNotificationPolicy) NamespacedResource() string {
 	return fmt.Sprintf("%v/%v/%v", np.ObjectMeta.Namespace, np.ObjectMeta.Name, np.ObjectMeta.UID)
 }
 
-// IsCrossNamespaceImportAllowed returns true when cross namespace imports are allowed
-func (np *GrafanaNotificationPolicy) IsCrossNamespaceImportAllowed() bool {
-	return np.Spec.AllowCrossNamespaceImport
-}
-
 //+kubebuilder:object:root=true
 
 // GrafanaNotificationPolicyList contains a list of GrafanaNotificationPolicy

diff --git a/controllers/notificationpolicy_controller.go b/controllers/notificationpolicy_controller.go
@@ -135,7 +135,7 @@ func (r *GrafanaNotificationPolicyReconciler) Reconcile(ctx context.Context, req
 
 	if notificationPolicy.Spec.Route.RouteSelector != nil || hasRouteSelector(notificationPolicy.Spec.Route) {
 		var namespace *string
-		if !notificationPolicy.IsCrossNamespaceImportAllowed() {
+		if !notificationPolicy.AllowCrossNamespace() {
 			ns := notificationPolicy.GetObjectMeta().GetNamespace()
 			namespace = &ns
 		}
@@ -357,7 +357,7 @@ func (r *GrafanaNotificationPolicyReconciler) SetupWithManager(mgr ctrl.Manager)
 					continue
 				}
 
-				if np.GetNamespace() != o.GetNamespace() && !np.IsCrossNamespaceImportAllowed() {
+				if np.GetNamespace() != o.GetNamespace() && !np.AllowCrossNamespace() {
 					continue
 				}