From 1881f6161a12f3fee8bb22238e1ece828529f433 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 14 Sep 2022 14:26:10 -0500 Subject: [PATCH] Fix kubelet and kubeadm configs. --- .github/workflows/ci.yml | 2 +- templates/kubeadm-kubelet-config.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8bf14f..9d9d3db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: include: - distro: rockylinux8 playbook: converge.yml - - distro: ubuntu2204 + - distro: ubuntu2004 playbook: converge.yml - distro: debian11 playbook: converge.yml diff --git a/templates/kubeadm-kubelet-config.j2 b/templates/kubeadm-kubelet-config.j2 index 7c4318b..3c49c2e 100644 --- a/templates/kubeadm-kubelet-config.j2 +++ b/templates/kubeadm-kubelet-config.j2 @@ -1,10 +1,10 @@ --- -apiVersion: kubeadm.k8s.io/v1beta2 +apiVersion: kubeadm.k8s.io/v1beta3 kind: InitConfiguration {{ kubernetes_config_init_configuration | to_nice_yaml }} --- +apiVersion: kubeadm.k8s.io/v1beta3 kind: ClusterConfiguration -apiVersion: kubeadm.k8s.io/v1beta2 {{ kubernetes_config_cluster_configuration | to_nice_yaml }} {% if kubernetes_config_kubelet_configuration|length > 0 %} ---