Browse Source
Merge pull request #2467 from huzhengchuan/fix/kubeadm_enable
Fix error in kubelet.kubeadm.env.j2
pull/2473/head
Aivars Sterns
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
2 deletions
-
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
|
|
@ -1,4 +1,4 @@ |
|
|
|
### Upstream source https://github.com/kubernetes/release/blob/master/debian/xenial/kubeadm/channel/stable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf |
|
|
|
### Upstream source https://github.com/kubernetes/release/blob/master/debian/xenial/kubeadm/channel/stable/etc/systemd/system/kubelet.service.d/ |
|
|
|
### All upstream values should be present in this file |
|
|
|
|
|
|
|
# logging to stderr means we get it in the systemd journal |
|
|
@ -23,13 +23,14 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" |
|
|
|
{% if kubelet_authentication_token_webhook %} |
|
|
|
--authentication-token-webhook \ |
|
|
|
{% endif %} |
|
|
|
{% if kubelet_authorization_mode_webhook %} |
|
|
|
--authorization-mode=Webhook \ |
|
|
|
{% endif %} |
|
|
|
--client-ca-file={{ kube_cert_dir }}/ca.crt \ |
|
|
|
--pod-manifest-path={{ kube_manifest_dir }} \ |
|
|
|
--cadvisor-port={{ kube_cadvisor_port }} \ |
|
|
|
{# end kubeadm specific settings #} |
|
|
|
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \ |
|
|
|
--kube-reserved cpu={{ kube_cpu_reserved }},memory={{ kube_memory_reserved|regex_replace('Mi', 'M') }} \ |
|
|
|
--node-status-update-frequency={{ kubelet_status_update_frequency }} \ |
|
|
|
--cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ |
|
|
|
--docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \ |
|
|
|