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

remove kubelet startup warnings for non docker container runtime (#6605) 

Removes these startup warnings:

Warning: For remote container runtime, --pod-infra-container-image is ignored in kubelet, which should be set in that remote runtime instead
Using "/var/run/crio/crio.sock" as endpoint is deprecated, please consider using full url format "unix:///var/run/crio/crio.sock".
pull/6637/head
Hans Feldt 2020-09-04 13:54:04 +02:00 committed by GitHub
parent 803d52ffce
commit 6613895de0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,10 +12,11 @@ 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 #}
{% if container_manager == 'docker' %}
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \ --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
{% if container_manager != 'docker' %} {% else %}
--container-runtime=remote \ --container-runtime=remote \
--container-runtime-endpoint={{ cri_socket }} \ --container-runtime-endpoint=unix://{{ cri_socket }} \
{% endif %} {% endif %}
{% if dynamic_kubelet_configuration %} {% if dynamic_kubelet_configuration %}
--dynamic-config-dir={{ dynamic_kubelet_configuration_dir }} \ --dynamic-config-dir={{ dynamic_kubelet_configuration_dir }} \