From 0ba2e655f4b96bca6316663c91cbd2d66839973b Mon Sep 17 00:00:00 2001
From: Victor Login <batazor111@gmail.com>
Date: Mon, 29 May 2023 02:09:42 +0200
Subject: [PATCH] Fix problem migration to k8s 1.27 (#10136)
* Fix `The task includes an option with an undefined variable` for 1.27
* delete old flag --container-runtime
Signed-off-by: Victor Login <batazor@evrone.com>
---------
Signed-off-by: Victor Login <batazor@evrone.com>
---
roles/download/defaults/main.yml | 1 +
roles/kubernetes/node/templates/kubelet.env.v1beta1.j2 | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 3b00d99d6..cfce37147 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -1071,6 +1071,7 @@ csi_livenessprobe_image_repo: "{{ kube_image_repo }}/sig-storage/livenessprobe"
csi_livenessprobe_image_tag: "v2.5.0"
snapshot_controller_supported_versions:
+ v1.27: "v4.2.1"
v1.26: "v4.2.1"
v1.25: "v4.2.1"
v1.24: "v4.2.1"
diff --git a/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2 b/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
index 4ccd0c932..b8a22fd1e 100644
--- a/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
+++ b/roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
@@ -11,7 +11,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--config={{ kube_config_dir }}/kubelet-config.yaml \
--kubeconfig={{ kube_config_dir }}/kubelet.conf \
{# end kubeadm specific settings #}
---container-runtime=remote \
--container-runtime-endpoint={{ cri_socket }} \
--runtime-cgroups={{ kubelet_runtime_cgroups }} \
{% endset %}
--
GitLab