Add unavailable toleration to Placement

ref: https://issues.redhat.com/browse/ACM-9871 Signed-off-by: Dale Haiducek <[email protected]>
open-cluster-management-io · Mar 1, 2024 · fce57b1 · fce57b1
1 parent 0b07cc7
commit fce57b1
Show file tree

Hide file tree

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

diff --git a/internal/plugin_test.go b/internal/plugin_test.go
@@ -171,6 +171,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 ---
@@ -775,6 +777,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 ---
@@ -789,6 +793,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 ---
@@ -1756,6 +1762,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -1801,6 +1809,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -1901,6 +1911,8 @@ spec:
                       values:
                         - pacman
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2048,6 +2060,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2159,6 +2173,8 @@ spec:
                       values:
                         - pacman
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2217,6 +2233,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2246,6 +2264,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2276,6 +2296,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -2688,6 +2710,8 @@ spec:
             labelSelector:
                 matchExpressions: []
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 ---
@@ -2823,6 +2847,8 @@ spec:
                       values:
                         - my-cluster
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 ---
@@ -3856,6 +3882,8 @@ spec:
                 matchLabels:
                     cloud: red hat
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -3909,6 +3937,8 @@ spec:
                         - red hat
                         - test
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `
@@ -3996,6 +4026,8 @@ spec:
                 matchLabels:
                     cloud: red hat
     tolerations:
+        - key: cluster.open-cluster-management.io/unavailable
+          operator: Exists
         - key: cluster.open-cluster-management.io/unreachable
           operator: Exists
 `

diff --git a/internal/testdata/ordering/default-deps-propagated.yaml b/internal/testdata/ordering/default-deps-propagated.yaml
@@ -86,6 +86,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -100,6 +102,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/default-extradeps-consolidated.yaml b/internal/testdata/ordering/default-extradeps-consolidated.yaml
@@ -94,6 +94,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -108,6 +110,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/default-extradeps-override.yaml b/internal/testdata/ordering/default-extradeps-override.yaml
@@ -109,6 +109,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -123,6 +125,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/default-extradeps-propagated.yaml b/internal/testdata/ordering/default-extradeps-propagated.yaml
@@ -109,6 +109,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -123,6 +125,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/dependency-details-config.yaml b/internal/testdata/ordering/dependency-details-config.yaml
@@ -48,6 +48,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/extradeps-overrides.yaml b/internal/testdata/ordering/extradeps-overrides.yaml
@@ -48,6 +48,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/ignore-pending-manifest-override.yaml b/internal/testdata/ordering/ignore-pending-manifest-override.yaml
@@ -93,6 +93,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -107,6 +109,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/ignore-pending-policy-consolidated.yaml b/internal/testdata/ordering/ignore-pending-policy-consolidated.yaml
@@ -83,6 +83,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -97,6 +99,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/ignore-pending-policy-override.yaml b/internal/testdata/ordering/ignore-pending-policy-override.yaml
@@ -93,6 +93,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -107,6 +109,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/ignore-pending-propagation.yaml b/internal/testdata/ordering/ignore-pending-propagation.yaml
@@ -94,6 +94,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -108,6 +110,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/manifest-extradeps-configpolicy.yaml b/internal/testdata/ordering/manifest-extradeps-configpolicy.yaml
@@ -96,6 +96,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -110,6 +112,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/manifest-extradeps.yaml b/internal/testdata/ordering/manifest-extradeps.yaml
@@ -97,6 +97,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -111,6 +113,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/one-ordered-policy.yaml b/internal/testdata/ordering/one-ordered-policy.yaml
@@ -42,6 +42,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/override-dependencies.yaml b/internal/testdata/ordering/override-dependencies.yaml
@@ -86,6 +86,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -100,6 +102,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---

diff --git a/internal/testdata/ordering/policy-extradeps.yaml b/internal/testdata/ordering/policy-extradeps.yaml
@@ -103,6 +103,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---
@@ -117,6 +119,8 @@ spec:
       labelSelector:
         matchExpressions: []
   tolerations:
+    - key: cluster.open-cluster-management.io/unavailable
+      operator: Exists
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
 ---