From 0651b9a91220bceec8e69c834e506b357dd750fb Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 22 Feb 2022 11:24:26 -0800 Subject: [PATCH] Add toleration for new "control-plane" node label for Concierge deploy --- deploy/concierge/deployment.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/concierge/deployment.yaml b/deploy/concierge/deployment.yaml index 9292168f..1cad1b6d 100644 --- a/deploy/concierge/deployment.yaml +++ b/deploy/concierge/deployment.yaml @@ -1,4 +1,4 @@ -#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved. +#! Copyright 2020-2022 the Pinniped contributors. All Rights Reserved. #! SPDX-License-Identifier: Apache-2.0 #@ load("@ytt:data", "data") @@ -221,7 +221,9 @@ spec: tolerations: - key: CriticalAddonsOnly operator: Exists - - key: node-role.kubernetes.io/master #! Allow running on master nodes too + - key: node-role.kubernetes.io/master #! Allow running on master nodes too (name deprecated by kubernetes 1.20). + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane #! The new name for these nodes as of Kubernetes 1.24. effect: NoSchedule #! "system-cluster-critical" cannot be used outside the kube-system namespace until Kubernetes >= 1.17, #! so we skip setting this for now (see https://github.com/kubernetes/kubernetes/issues/60596).