Browse Source

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 2 months ago
committed by GitHub
parent
commit
c3de25c782
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 1 deletions
  1. 1
      roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
  2. 1
      roles/kubernetes/node/templates/kubelet.env.v1beta1.j2

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

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

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-endpoint={{ cri_socket }} \
--runtime-cgroups={{ kubelet_runtime_cgroups }} \
{% endset %}

Loading…
Cancel
Save