[kubernetes] drop pre 1.22.0 workarounds

This commit is contained in:
Calin Cristian Andrei
2022-06-06 18:10:10 +03:00
committed by Kubernetes Prow Robot
parent 9535a41187
commit ae1dcb031f
6 changed files with 1 additions and 44 deletions

View File

@@ -1,13 +1,4 @@
---
- name: Make sure dynamic kubelet configuration directory is writeable
file:
path: "{{ dynamic_kubelet_configuration_dir }}"
mode: 0600
state: directory
when:
- dynamic_kubelet_configuration
- kube_version is version('v1.22.0', '<')
- name: Set kubelet api version to v1beta1
set_fact:
kubeletConfig_api_version: v1beta1

View File

@@ -18,9 +18,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--container-runtime=remote \
--container-runtime-endpoint=unix://{{ cri_socket }} \
{% endif %}
{% if dynamic_kubelet_configuration and kube_version is version('v1.22.0', '<') %}
--dynamic-config-dir={{ dynamic_kubelet_configuration_dir }} \
{% endif %}
--runtime-cgroups={{ kubelet_runtime_cgroups }} \
{% endset %}