kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the CRI endpoint setting to kubelet config (#11550) 

The `--container-runtime-endpoint` kubelet argument is deprecated in
favor of the config file alternative.
pull/11002/head
Max Gautier 2024-09-18 02:34:45 +02:00 committed by GitHub
parent 59dd713585
commit c3de25c782
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
View File

@ -26,6 +26,7 @@ staticPodPath: {{ kube_manifest_dir }}
cgroupDriver: {{ kubelet_cgroup_driver | default('systemd') }} cgroupDriver: {{ kubelet_cgroup_driver | default('systemd') }}
containerLogMaxFiles: {{ kubelet_logfiles_max_nr }} containerLogMaxFiles: {{ kubelet_logfiles_max_nr }}
containerLogMaxSize: {{ kubelet_logfiles_max_size }} containerLogMaxSize: {{ kubelet_logfiles_max_size }}
containerRuntimeEndpoint : {{ cri_socket }}
maxPods: {{ kubelet_max_pods }} maxPods: {{ kubelet_max_pods }}
podPidsLimit: {{ kubelet_pod_pids_limit }} podPidsLimit: {{ kubelet_pod_pids_limit }}
address: {{ kubelet_bind_address }} address: {{ kubelet_bind_address }}

1
roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
View File

@ -11,7 +11,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--config={{ kube_config_dir }}/kubelet-config.yaml \ --config={{ kube_config_dir }}/kubelet-config.yaml \
--kubeconfig={{ kube_config_dir }}/kubelet.conf \ --kubeconfig={{ kube_config_dir }}/kubelet.conf \
{# end kubeadm specific settings #} {# end kubeadm specific settings #}
--container-runtime-endpoint={{ cri_socket }} \
--runtime-cgroups={{ kubelet_runtime_cgroups }} \ --runtime-cgroups={{ kubelet_runtime_cgroups }} \
{% endset %} {% endset %}