From 1a4567ac29fd9dc36130e72ed1715f6c8f377d80 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Thu, 14 Nov 2024 09:29:13 +0100
Subject: [PATCH] Remove deprecated key from kubeadmconfig/v1beta4 (#11709)
timeoutForControlPlane has been removed from v1beta4, instead remplaced
by https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-Timeouts
The default for the new value are close enough that there is no need to
override them.
---
.../control-plane/templates/kubeadm-config.v1beta4.yaml.j2 | 1 -
1 file changed, 1 deletion(-)
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
index 00ff32edc..1d5ac1d8f 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
@@ -342,7 +342,6 @@ apiServer:
{% for san in apiserver_sans %}
- "{{ san }}"
{% endfor %}
- timeoutForControlPlane: 5m0s
controllerManager:
extraArgs:
- name: node-monitor-grace-period
--
GitLab