Browse Source

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>
pull/10149/head
Victor Login 1 year ago
committed by GitHub
parent
commit
0ba2e655f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
  1. 1
      roles/download/defaults/main.yml
  2. 1
      roles/kubernetes/node/templates/kubelet.env.v1beta1.j2

1
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"

1
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 %}

Loading…
Cancel
Save