From fc0d58ff480d1af4ad95e9d62751c1506e3f64b2 Mon Sep 17 00:00:00 2001
From: Kay Yan <yankay@users.noreply.github.com>
Date: Tue, 20 Dec 2022 07:57:43 +0800
Subject: [PATCH] fix-missing-control-plane-taint (#9592)
---
.../control-plane/templates/kubeadm-config.v1beta3.yaml.j2 | 2 ++
.../templates/kubeadm-controlplane.v1beta3.yaml.j2 | 2 ++
2 files changed, 4 insertions(+)
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
index 75ed363bb..2fbd5534d 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
@@ -20,6 +20,8 @@ nodeRegistration:
taints:
- effect: NoSchedule
key: node-role.kubernetes.io/master
+ - effect: NoSchedule
+ key: node-role.kubernetes.io/control-plane
{% else %}
taints: []
{% endif %}
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
index b41b2dbc7..b4b3c5ecc 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
@@ -23,6 +23,8 @@ nodeRegistration:
taints:
- effect: NoSchedule
key: node-role.kubernetes.io/master
+ - effect: NoSchedule
+ key: node-role.kubernetes.io/control-plane
{% else %}
taints: []
{% endif %}
--
GitLab