C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support cAdvisor (#1908)

Browse source 
Signed-off-by: Haiwei Liu <carllhw@gmail.com>
This commit is contained in:
Haiwei Liu 2017-11-06 21:50:28 +08:00 committed by Matthew Mosesohn
parent a1244d7bd3
commit ad0cd6939a
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/kubernetes/node/defaults/main.yml
View file

@ -79,3 +79,6 @@ kube_hyperkube_image_repo: ""
# If non-empty, will use this string as identification instead of the actual hostname # If non-empty, will use this string as identification instead of the actual hostname
kube_override_hostname: "{{ ansible_hostname }}" kube_override_hostname: "{{ ansible_hostname }}"
# cAdvisor port
kube_cadvisor_port: 0

2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View file

@ -21,7 +21,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--client-ca-file={{ kube_cert_dir }}/ca.crt \ --client-ca-file={{ kube_cert_dir }}/ca.crt \
--pod-manifest-path={{ kube_manifest_dir }} \ --pod-manifest-path={{ kube_manifest_dir }} \
--cadvisor-port=0 \ --cadvisor-port={{ kube_cadvisor_port }} \
{# end kubeadm specific settings #} {# end kubeadm specific settings #}
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \ --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
--kube-reserved cpu={{ kubelet_cpu_limit }},memory={{ kubelet_memory_limit|regex_replace('Mi', 'M') }} \ --kube-reserved cpu={{ kubelet_cpu_limit }},memory={{ kubelet_memory_limit|regex_replace('Mi', 'M') }} \

4
roles/kubernetes/node/templates/kubelet.standard.env.j2
View file

@ -10,7 +10,9 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre
KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% endif %} {% endif %}
{# Base kubelet args #} {# Base kubelet args #}
{% set kubelet_args_base %}--pod-manifest-path={{ kube_manifest_dir }} \ {% set kubelet_args_base %}
--pod-manifest-path={{ kube_manifest_dir }} \
--cadvisor-port={{ kube_cadvisor_port }} \
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \ --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
--node-status-update-frequency={{ kubelet_status_update_frequency }} \ --node-status-update-frequency={{ kubelet_status_update_frequency }} \
--docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \ --docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \