Limit overlap detection to the same cluster

Otherwise, hosted mode runs into problems where it believes there will
be an overlap, but actually the policies are for different clusters.

Refs:
 - https://issues.redhat.com/browse/ACM-12032

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
(cherry picked from commit 04184bc)

controllers/operatorpolicy_controller.go

@@ -53,6 +53,8 @@ const (
 	olmGracePeriod                = 30 * time.Second
 	ManagedByLabel         string = "operatorpolicy.policy.open-cluster-management.io/managed"
 	ManagedByAnnotation    string = ManagedByLabel
+	ClusterNameLabel       string = "policy.open-cluster-management.io/cluster-name"
+	ClusterNamespaceLabel  string = "policy.open-cluster-management.io/cluster-namespace"
 )
 
 var (
@@ -476,8 +478,15 @@ func (r *OperatorPolicyReconciler) checkSubOverlap(
 		return statusChanged, nil, nil
 	}
 
+	// limit to OperatorPolicies for the same cluster as the policy
+	// (this cluster might be hosting OperatorPolicies for other clusters)
+	sel := labels.SelectorFromSet(map[string]string{
+		ClusterNameLabel:      policy.GetLabels()[ClusterNameLabel],
+		ClusterNamespaceLabel: policy.GetLabels()[ClusterNamespaceLabel],
+	})
+
 	opList := &policyv1beta1.OperatorPolicyList{}
-	if err := r.List(ctx, opList); err != nil {
+	if err := r.List(ctx, opList, &client.ListOptions{LabelSelector: sel}); err != nil {
 		return statusChanged, nil, err
 	}
 

test/resources/case38_operator_install/operator-policy-all-defaults.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-argocd.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
     - apiVersion: policy.open-cluster-management.io/v1
       kind: Policy

test/resources/case38_operator_install/operator-policy-authorino.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-defaults-invalid-source.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-manual-upgrades.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-mustnothave-any-version.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-mustnothave.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-exist-enforce.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-group-csv-fail.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-group-enforce-one-version.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-group-enforce.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-group-one-version.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-no-group.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-strimzi-kafka-operator.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
     - apiVersion: policy.open-cluster-management.io/v1
       kind: Policy

test/resources/case38_operator_install/operator-policy-validity-test.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-with-group.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy

test/resources/case38_operator_install/operator-policy-with-templates.yaml

@@ -5,6 +5,9 @@ metadata:
   annotations:
     policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
     policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  labels:
+    policy.open-cluster-management.io/cluster-name: "managed"
+    policy.open-cluster-management.io/cluster-namespace: "managed"
   ownerReferences:
   - apiVersion: policy.open-cluster-management.io/v1
     kind: Policy