Merge pull request #843 from ravisantoshgudimetla/fix-tolerations

Fix tolerations
operator-framework · May 7, 2019 · 8218b59 · 8218b59
2 parents 7c22f02 + 688edfc
commit 8218b59
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 9 deletions.
diff --git a/Documentation/install/local-values.yaml b/Documentation/install/local-values.yaml
@@ -30,7 +30,17 @@ package:
   service:
     internalPort: 5443
   tolerations:
-    - operator: Exists
+  - 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
 
 catalog_sources:
   - rh-operators
diff --git a/deploy/ocp/values.yaml b/deploy/ocp/values.yaml
@@ -17,7 +17,17 @@ olm:
     beta.kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
-  - operator: Exists
+  - 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 
   tlsCertPath: /var/run/secrets/serving-cert/tls.crt
   tlsKeyPath: /var/run/secrets/serving-cert/tls.key
 catalog:
@@ -31,7 +41,17 @@ catalog:
     beta.kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
-  - operator: Exists
+  - 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
 package:
   replicaCount: 2
   image:
@@ -43,4 +63,14 @@ package:
     beta.kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
-  - operator: Exists
+  - 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
diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
@@ -72,5 +72,15 @@ spec:
         node-role.kubernetes.io/master: ""
 
       tolerations:
-        - operator: Exists
+      - 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 
 
diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -69,5 +69,15 @@ spec:
         node-role.kubernetes.io/master: ""
 
       tolerations:
-        - operator: Exists
+      - 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
 
diff --git a/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml b/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml
@@ -82,8 +82,17 @@ spec:
                 node-role.kubernetes.io/master: ""
 
               tolerations:
-                - operator: Exists
-
+              - 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  
               containers:
               - name: packageserver
                 command:

diff --git a/manifests/0000_50_olm_17-packageserver.deployment.yaml b/manifests/0000_50_olm_17-packageserver.deployment.yaml
@@ -24,7 +24,17 @@ spec:
         node-role.kubernetes.io/master: ""
 
       tolerations:
-        - operator: Exists
+      - 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
 
       containers:
       - name: packageserver