From 35e4ee50a4f5fd8abb2c20374c770392a7f730a9 Mon Sep 17 00:00:00 2001
From: dougbtv <dosmith@redhat.com>
Date: Wed, 17 Oct 2018 13:30:59 -0400
Subject: [PATCH] Fixes flannel daemonset stuck in pod queue in Kubernetes
 1.12.x per #170

---
 images/flannel-daemonset.yml | 17 ++++++-----------
 images/multus-daemonset.yml  |  3 +--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/images/flannel-daemonset.yml b/images/flannel-daemonset.yml
index 4e57a6bed..1939661dc 100644
--- a/images/flannel-daemonset.yml
+++ b/images/flannel-daemonset.yml
@@ -101,8 +101,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       # ------------------------------- Intentionally removed, Multus daemonset configures /etc/cni/net.d
@@ -181,8 +180,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: arm64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -260,8 +258,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: arm
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -339,8 +336,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: ppc64le
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -418,8 +414,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: s390x
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
@@ -476,4 +471,4 @@ spec:
             path: /etc/cni/net.d
         - name: flannel-cfg
           configMap:
-            name: kube-flannel-cfg
\ No newline at end of file
+            name: kube-flannel-cfg
diff --git a/images/multus-daemonset.yml b/images/multus-daemonset.yml
index 857541b77..3c95513b8 100644
--- a/images/multus-daemonset.yml
+++ b/images/multus-daemonset.yml
@@ -111,8 +111,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: multus
       containers: