Merge pull request #1045 from outcoldman/k8s-1.12-fix

Do not define keys for tolerations
flannel-io · Oct 5, 2018 · 13a990b · 13a990b
2 parents 1aa15b9 + bc79dd1
commit 13a990b
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
@@ -98,8 +98,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -177,8 +176,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: arm64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -256,8 +254,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: arm
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -335,8 +332,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: ppc64le
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -414,8 +410,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: s390x
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers: