From 8e2462f3889aa9e79d7479310ae770c1c1393800 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Tue, 16 Apr 2024 08:18:51 +0200
Subject: [PATCH] Update kubeadm template

---
 templates/kubeadm-config.yaml.j2 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2
index 0dcf866..8dc8a7e 100644
--- a/templates/kubeadm-config.yaml.j2
+++ b/templates/kubeadm-config.yaml.j2
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: InitConfiguration
 {% if kubetoken is defined %}
 bootstrapTokens:
@@ -14,8 +14,9 @@ nodeRegistration:
 {% elif  kubernetes_cri == "docker" %}
   criSocket: "/var/run/docker.sock"
 {% endif %}
+  name: {{ ansible_hostname }}
 {% if false %}
-  name: "ec2-10-100-0-1"
+  imagePullPolicy: IfNotPresent
   taints:
   - key: "kubeadmNode"
     value: "master"
@@ -33,7 +34,7 @@ nodeRegistration:
     container-runtime-endpoint: "unix:///var/run/crio/crio.sock"
 {% endif %}
     node-ip: {{ lookup('vars', 'ansible_' + kubernetes_interface ).ipv4.address }}
-#    read-only-port: "10255"
+    read-only-port: "10255"
   ignorePreflightErrors:
   - SystemVerification
 {% if (kubernetes_master|bool and not kubernetes_master_taint|bool) %}
@@ -50,7 +51,7 @@ certificateKey: "{{ kubernetes_certificateKey.stdout }}"
 {% endif %}
 {% if kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %}
 ---
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration
 kubernetesVersion: stable
 {% if lbip_kubeapiserver is defined %}
@@ -99,12 +100,13 @@ scheduler:
     bind-address: 0.0.0.0
 etcd:
   local:
+    dataDir: /var/lib/etcd
     extraArgs: 
         listen-metrics-urls: http://0.0.0.0:2381
 {% endif %}
 {% if not kubernetes_master|bool or kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
 ---
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: JoinConfiguration
 {% if kubernetes_master|bool %}
 controlPlane: