Merge pull request #822 from kvaps/fix-821

fix tolerations for >1.16
cloudnativelabs · Jul 10, 2020 · 27857d3 · 27857d3
2 parents b6acd0a + c61dc8f
commit 27857d3
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 60 deletions.
diff --git a/daemonset/generic-kuberouter-all-features-advertise-routes.yaml b/daemonset/generic-kuberouter-all-features-advertise-routes.yaml
@@ -140,13 +140,11 @@ spec:
           mountPath: /var/lib/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/generic-kuberouter-all-features.yaml b/daemonset/generic-kuberouter-all-features.yaml
@@ -136,13 +136,11 @@ spec:
           mountPath: /var/lib/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/generic-kuberouter-only-advertise-routes.yaml b/daemonset/generic-kuberouter-only-advertise-routes.yaml
@@ -61,13 +61,11 @@ spec:
           readOnly: false
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
         - name: xtables-lock

diff --git a/daemonset/generic-kuberouter.yaml b/daemonset/generic-kuberouter.yaml
@@ -106,13 +106,11 @@ spec:
           name: kube-router-cfg
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml
@@ -105,13 +105,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kube-router-all-service-daemonset.yaml b/daemonset/kube-router-all-service-daemonset.yaml
@@ -101,13 +101,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kube-router-firewall-daemonset.yaml b/daemonset/kube-router-firewall-daemonset.yaml
@@ -100,13 +100,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kube-router-proxy-daemonset.yaml b/daemonset/kube-router-proxy-daemonset.yaml
@@ -100,13 +100,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kubeadm-kuberouter-all-features-dsr.yaml b/daemonset/kubeadm-kuberouter-all-features-dsr.yaml
@@ -115,13 +115,11 @@ spec:
       hostIPC: true
       hostPID: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kubeadm-kuberouter-all-features-hostport.yaml b/daemonset/kubeadm-kuberouter-all-features-hostport.yaml
@@ -117,13 +117,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kubeadm-kuberouter-all-features.yaml b/daemonset/kubeadm-kuberouter-all-features.yaml
@@ -110,13 +110,11 @@ spec:
           mountPath: /etc/kube-router
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules

diff --git a/daemonset/kubeadm-kuberouter.yaml b/daemonset/kubeadm-kuberouter.yaml
@@ -109,13 +109,11 @@ spec:
           name: kube-router-cfg
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
       - effect: NoSchedule
-        key: node-role.kubernetes.io/master
         operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
         operator: Exists
       volumes:
       - name: lib-modules