From 7da2083986b1bac73a1f39642ee9121d9b6b356e Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Thu, 5 Dec 2019 17:24:32 +0300
Subject: [PATCH] Add toleration for calico-typha on master (#5405)
Change-Id: Iea9a366cf6ccc4d491bfc49c5d2dba6d98f81b69
---
roles/network_plugin/calico/templates/calico-typha.yml.j2 | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2
index 4826387b3..227b07bcb 100644
--- a/roles/network_plugin/calico/templates/calico-typha.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2
@@ -45,19 +45,15 @@ spec:
labels:
k8s-app: calico-typha
annotations:
- # This, along with the CriticalAddonsOnly toleration below, marks the pod as a critical
- # add-on, ensuring it gets priority scheduling and that its resources are reserved
- # if it ever gets evicted.
- scheduler.alpha.kubernetes.io/critical-pod: ''
cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
spec:
nodeSelector:
beta.kubernetes.io/os: linux
hostNetwork: true
tolerations:
- # Mark the pod as a critical add-on for rescheduling.
- - key: CriticalAddonsOnly
+ - key: node-role.kubernetes.io/master
operator: Exists
+ effect: NoSchedule
# Since Calico can't network a pod until Typha is up, we need to run Typha itself
# as a host-networked pod.
serviceAccountName: calico-node
--
GitLab