From 6ae433724915e6326148ab864541433936970b36 Mon Sep 17 00:00:00 2001
From: ozdanborne <dan@projectcalico.org>
Date: Thu, 27 Aug 2020 12:55:10 -0400
Subject: [PATCH] remove nodeAffinity from typha

---
 upup/models/bindata.go                           | 16 ----------------
 .../k8s-1.16.yaml.template                       |  8 --------
 .../k8s-1.16.yaml.template                       |  8 --------
 3 files changed, 32 deletions(-)

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
index 5da097923c..1237f16681 100644
--- a/upup/models/bindata.go
+++ b/upup/models/bindata.go
@@ -12233,14 +12233,6 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
     spec:
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            preference:
-              matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
@@ -16226,14 +16218,6 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
     spec:
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            preference:
-              matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.16.yaml.template
index 4c48c4eb0d..913baaf90c 100644
--- a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.16.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.16.yaml.template
@@ -531,14 +531,6 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
     spec:
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            preference:
-              matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
index 7b477c120e..49a58d3595 100644
--- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
@@ -3497,14 +3497,6 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
     spec:
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            preference:
-              matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true