Set unreachable Toleration in Placement

Without it, ManagedClusters that are unreachable are patched with a Taint and aren't returned by the Placement controller. ref: https://issues.redhat.com/browse/ACM-9871 Signed-off-by: Dale Haiducek <[email protected]>
open-cluster-management-io · Feb 13, 2024 · 60c4103 · 60c4103
1 parent 60d90e0
commit 60c4103
Show file tree

Hide file tree

Showing 20 changed files with 147 additions and 0 deletions.
diff --git a/internal/plugin.go b/internal/plugin.go
@@ -1652,6 +1652,12 @@ func (p *Plugin) createPlacement(
 							},
 						},
 					},
+					"tolerations": []map[string]interface{}{
+						{
+							"key":      "cluster.open-cluster-management.io/unreachable",
+							"operator": "Exists",
+						},
+					},
 				},
 			}
 		}

diff --git a/internal/plugin_test.go b/internal/plugin_test.go
@@ -170,6 +170,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -771,6 +774,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -782,6 +788,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -1746,6 +1755,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)
@@ -1788,6 +1800,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)
@@ -1885,6 +1900,9 @@ spec:
                       operator: In
                       values:
                         - pacman
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)
@@ -2029,6 +2047,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	p, plrPath := plPathHelper(t, plrYAML, true)
 
@@ -2137,6 +2158,9 @@ spec:
                       operator: In
                       values:
                         - pacman
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	plrYAML = strings.TrimPrefix(plrYAML, "\n")
 	p, _ := plPathHelper(t, plrYAML, false)
@@ -2192,6 +2216,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	p, plrPath := plPathHelper(t, plrYAML, false)
 
@@ -2218,6 +2245,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	p, plrPath := plPathHelper(t, plrYAML, false)
 
@@ -2245,6 +2275,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	p, plrPath := plPathHelper(t, plrYAML, false)
 
@@ -2654,6 +2687,9 @@ spec:
         - requiredClusterSelector:
             labelSelector:
                 matchExpressions: []
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -2786,6 +2822,9 @@ spec:
                       operator: In
                       values:
                         - my-cluster
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
@@ -3816,6 +3855,9 @@ spec:
             labelSelector:
                 matchLabels:
                     cloud: red hat
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)
@@ -3866,6 +3908,9 @@ spec:
                       values:
                         - red hat
                         - test
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)
@@ -3950,6 +3995,9 @@ spec:
                         - red hat
                 matchLabels:
                     cloud: red hat
+    tolerations:
+        - key: cluster.open-cluster-management.io/unreachable
+          operator: Exists
 `
 	expected = strings.TrimPrefix(expected, "\n")
 	assertEqual(t, output, expected)

diff --git a/internal/testdata/ordering/default-deps-propagated.yaml b/internal/testdata/ordering/default-deps-propagated.yaml
@@ -85,6 +85,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -96,6 +99,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/default-extradeps-consolidated.yaml b/internal/testdata/ordering/default-extradeps-consolidated.yaml
@@ -93,6 +93,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -104,6 +107,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/default-extradeps-override.yaml b/internal/testdata/ordering/default-extradeps-override.yaml
@@ -108,6 +108,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -119,6 +122,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/default-extradeps-propagated.yaml b/internal/testdata/ordering/default-extradeps-propagated.yaml
@@ -108,6 +108,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -119,6 +122,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/dependency-details-config.yaml b/internal/testdata/ordering/dependency-details-config.yaml
@@ -47,6 +47,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/extradeps-overrides.yaml b/internal/testdata/ordering/extradeps-overrides.yaml
@@ -47,6 +47,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/ignore-pending-manifest-override.yaml b/internal/testdata/ordering/ignore-pending-manifest-override.yaml
@@ -92,6 +92,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -103,6 +106,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/ignore-pending-policy-consolidated.yaml b/internal/testdata/ordering/ignore-pending-policy-consolidated.yaml
@@ -82,6 +82,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -93,6 +96,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/ignore-pending-policy-override.yaml b/internal/testdata/ordering/ignore-pending-policy-override.yaml
@@ -92,6 +92,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -103,6 +106,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/ignore-pending-propagation.yaml b/internal/testdata/ordering/ignore-pending-propagation.yaml
@@ -93,6 +93,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -104,6 +107,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/manifest-extradeps-configpolicy.yaml b/internal/testdata/ordering/manifest-extradeps-configpolicy.yaml
@@ -95,6 +95,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -106,6 +109,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding

diff --git a/internal/testdata/ordering/manifest-extradeps.yaml b/internal/testdata/ordering/manifest-extradeps.yaml
@@ -96,6 +96,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
@@ -107,6 +110,9 @@ spec:
   - requiredClusterSelector:
       labelSelector:
         matchExpressions: []
+  tolerations:
+    - key: cluster.open-cluster-management.io/unreachable
+      operator: Exists
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
-Original file line number
+Diff line change
@@ Expand Up / @@ -1652,6 +1652,12 @@ func (p *Plugin) createPlacement( @@
     							},
     						},
     					},
+    					"tolerations": []map[string]interface{}{
+    						{
+    							"key":      "cluster.open-cluster-management.io/unreachable",
+    							"operator": "Exists",
+    						},
+    					},
     				},
     			}
     		}
@@ Expand Down @@