Merge pull request #311 from ravisantoshgudimetla/fix-tolerations

Fix tolerations

Author: openshift-merge-robot

config/kubemark.yaml

@@ -58,11 +58,13 @@ spec:
       - key: CriticalAddonsOnly
         operator: Exists
       - effect: NoExecute
-        key: node.alpha.kubernetes.io/notReady
+        key: node.kubernetes.io/not-ready
         operator: Exists
+        tolerationSeconds: 120
       - effect: NoExecute
-        key: node.alpha.kubernetes.io/unreachable
+        key: node.kubernetes.io/unreachable
         operator: Exists
+        tolerationSeconds: 120
       containers:
       - name: unready-nodes-gb
         image: gofed/kubemark-machine-controllers:v1.0

install/0000_30_machine-api-operator_09_deployment.yaml

@@ -49,6 +49,14 @@ spec:
       - key: "node-role.kubernetes.io/master"
         operator: "Exists"
         effect: "NoSchedule"
+      - key: "node.kubernetes.io/unreachable"
+        operator: "Exists"
+        effect: "NoExecute"
+        tolerationSeconds: 120
+      - key: "node.kubernetes.io/not-ready"
+        operator: "Exists"
+        effect: "NoExecute"
+        tolerationSeconds: 120
       volumes:
       - name: images
         configMap:

owned-manifests/machine-api-controllers.yaml

@@ -31,11 +31,13 @@ spec:
       - key: CriticalAddonsOnly
         operator: Exists
       - effect: NoExecute
-        key: node.alpha.kubernetes.io/notReady
+        key: node.kubernetes.io/not-ready
         operator: Exists
+        tolerationSeconds: 120
       - effect: NoExecute
-        key: node.alpha.kubernetes.io/unreachable
+        key: node.kubernetes.io/unreachable
         operator: Exists
+        tolerationSeconds: 120
       containers:
       - name: controller-manager
         image: {{ .Controllers.Provider }}