epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-26 03:28:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove kubeadm config api version: v1beta3 for kubeadm config template (#13027)

Browse Source
This commit is contained in:
Srishti Jaiswal
2026-03-11 20:27:38 +05:30
committed by GitHub
parent 1bafb8e882
commit ba70ed35f0
7 changed files with 5 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.j2
View File

@@ -1,5 +1,5 @@
---
apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }}
apiVersion: kubeadm.k8s.io/v1beta4
kind: JoinConfiguration
discovery:
{% if kubeadm_use_file_discovery %}
@@ -21,13 +21,8 @@ discovery:
{% endif %}
{% endif %}
tlsBootstrapToken: {{ kubeadm_token }}
{# TODO: drop the if when we drop support for k8s<1.31 #}
{% if kubeadm_config_api_version == 'v1beta3' %}
timeout: {{ discovery_timeout }}
{% else %}
timeouts:
discovery: {{ discovery_timeout }}
{% endif %}
caCertPath: {{ kube_cert_dir }}/ca.crt
{% if kubeadm_cert_controlplane is defined and kubeadm_cert_controlplane %}
controlPlane: