summaryrefslogtreecommitdiff
path: root/roles/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'roles/kubernetes')
-rw-r--r--roles/kubernetes/base/defaults/main.yml2
-rw-r--r--roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j21
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml
index 9e97a8fb..af48181c 100644
--- a/roles/kubernetes/base/defaults/main.yml
+++ b/roles/kubernetes/base/defaults/main.yml
@@ -1,2 +1,2 @@
---
-kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0-1"
+kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0-00"
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
index 13911b31..390c1b15 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
@@ -14,6 +14,7 @@ localAPIEndpoint:
{% if kubernetes_network_plugin_replaces_kube_proxy %}
skipPhases:
- addon/kube-proxy
+{#- show-join-command can be enable for 1.26+ #}
{% endif %}
nodeRegistration:
name: "{{ kubernetes_node_name }}"