From 9407c3f8f693659013bbf5e278117cd7c7a08bc2 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Tue, 24 May 2022 21:51:27 -0700 Subject: [PATCH] tolerate both 1.24+ and prior control plane taints (#562) * tolerate both 1.24+ and prior control plane taints * bump chart version --- charts/kured/Chart.yaml | 2 +- charts/kured/templates/daemonset.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/charts/kured/Chart.yaml b/charts/kured/Chart.yaml index e6b95dc..c667cdc 100644 --- a/charts/kured/Chart.yaml +++ b/charts/kured/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.9.2" description: A Helm chart for kured name: kured -version: 2.14.1 +version: 2.14.2 home: https://github.com/weaveworks/kured maintainers: - name: ckotzbauer diff --git a/charts/kured/templates/daemonset.yaml b/charts/kured/templates/daemonset.yaml index 960a617..a9b282c 100644 --- a/charts/kured/templates/daemonset.yaml +++ b/charts/kured/templates/daemonset.yaml @@ -175,13 +175,10 @@ spec: {{ toYaml . | indent 8 }} {{- end }} {{- else }} - {{- if ge .Capabilities.KubeVersion.Minor "24" }} - key: node-role.kubernetes.io/control-plane effect: NoSchedule - {{- else }} - key: node-role.kubernetes.io/master effect: NoSchedule - {{- end }} {{- end }} {{- with .Values.nodeSelector }} nodeSelector: