[kubeadm] use v1beta3 configuration version

* extra admission controls now don't have a version in their file names
  eventratelimit.v1beta2.yaml.j2 -> eventratelimit.yaml.j2
* cri_socket variable includes the unix:// prefix to be conformat with
  upstream
This commit is contained in:
Calin Cristian Andrei
2022-06-06 22:25:57 +03:00
committed by Kubernetes Prow Robot
parent 589823bdc1
commit 2cd8c51a07
12 changed files with 21 additions and 20 deletions

View File

@@ -289,11 +289,11 @@ container_manager_on_localhost: "{{ container_manager }}"
# CRI socket path
cri_socket: >-
{%- if container_manager == 'crio' -%}
/var/run/crio/crio.sock
unix:///var/run/crio/crio.sock
{%- elif container_manager == 'containerd' -%}
/var/run/containerd/containerd.sock
unix:////var/run/containerd/containerd.sock
{%- elif container_manager == 'docker' -%}
/var/run/cri-dockerd.sock
unix:///var/run/cri-dockerd.sock
{%- endif -%}
## Uncomment this if you want to force overlay/overlay2 as docker storage driver