Update placements to use local-cluster label

Basing things off of only the name being "local-cluster" may not be reliable. Refs: - https://issues.redhat.com/browse/ACM-13274 Signed-off-by: Justin Kulikauskas <[email protected]>
open-cluster-management-io · Aug 20, 2024 · 281bb27 · 281bb27
1 parent f8d8dc9
commit 281bb27
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/community/CM-Configuration-Management/acm-hub-pvc-backup/acm-hub-pvc-placement.yaml b/community/CM-Configuration-Management/acm-hub-pvc-backup/acm-hub-pvc-placement.yaml
@@ -9,10 +9,10 @@ spec:
     - requiredClusterSelector:
         labelSelector:
           matchExpressions:
-            - key: name
+            - key: local-cluster
               operator: In
               values:
-                - local-cluster
+                - 'true'
     - requiredClusterSelector:
         labelSelector:
           matchExpressions:

diff --git a/policygenerator/kustomize/policyGenerator.yaml b/policygenerator/kustomize/policyGenerator.yaml
@@ -8,8 +8,9 @@ policyDefaults:
   namespace: policies
   placement:
     name: demo-placement-rule
-    clusterSelectors:
-      name: local-cluster
+    labelSelector:
+      matchExpressions:
+        - {key: "local-cluster", operator: In, values: ["true"]}
   remediationAction: inform
   severity: medium
 policies:

diff --git a/policygenerator/policy-sets/community/acs-secure/policyGenerator.yaml b/policygenerator/policy-sets/community/acs-secure/policyGenerator.yaml
@@ -41,12 +41,12 @@ policySets:
     placement:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
   - description: The Advanced Cluster Security components distributed to all OpenShift
       managed clusters to secure the clusters.
     name: acs-sensor-clusters
     placement:
       labelSelector:
         matchExpressions:
           - {key: vendor, operator: In, values: ["OpenShift"]}
-          - {key: name, operator: NotIn, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: NotIn, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/gatekeeper/placement.yaml b/policygenerator/policy-sets/community/gatekeeper/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/kyverno/best-practises-for-apps/placement.yaml b/policygenerator/policy-sets/community/kyverno/best-practises-for-apps/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/placement.yaml b/policygenerator/policy-sets/community/kyverno/multitenancy/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/kyverno/security/placement.yaml b/policygenerator/policy-sets/community/kyverno/security/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/openshift-gitops/placement.yaml b/policygenerator/policy-sets/community/openshift-gitops/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/openshift-plus-setup/placement.yaml b/policygenerator/policy-sets/community/openshift-plus-setup/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/community/policygenerator-download/generator.yml b/policygenerator/policy-sets/community/policygenerator-download/generator.yml
@@ -17,7 +17,7 @@ policyDefaults:
   placement:
     labelSelector:
       matchLabels:
-        name: local-cluster
+        local-cluster: 'true'
 
 policies:
   - name: acm-policygenerator-downloader

diff --git a/policygenerator/policy-sets/stable/acm-hardening/input/placement.yaml b/policygenerator/policy-sets/stable/acm-hardening/input/placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}
diff --git a/policygenerator/policy-sets/stable/openshift-plus/input/clusters-placement.yaml b/policygenerator/policy-sets/stable/openshift-plus/input/clusters-placement.yaml
@@ -9,4 +9,4 @@ spec:
       labelSelector:
         matchExpressions:
           - {key: vendor, operator: In, values: ["OpenShift"]}
-          - {key: name, operator: NotIn, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: NotIn, values: ["true"]}
diff --git a/policygenerator/policy-sets/stable/openshift-plus/input/hub-placement.yaml b/policygenerator/policy-sets/stable/openshift-plus/input/hub-placement.yaml
@@ -8,4 +8,4 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions:
-          - {key: name, operator: In, values: ["local-cluster"]}
+          - {key: "local-cluster", operator: In, values: ["true"]}