From 50e3ccfa2baed51522740ed3aa97e7f86f38bdae Mon Sep 17 00:00:00 2001
From: Dann Bohn <djb44@psu.edu>
Date: Mon, 12 Mar 2018 12:46:14 -0400
Subject: [PATCH] uses new kube_memory_reserved/kube_cpu_reserved variables in
kubelt
---
roles/kubernetes/node/templates/kubelet-container.j2 | 4 ++--
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes/node/templates/kubelet-container.j2 b/roles/kubernetes/node/templates/kubelet-container.j2
index 4e8d4c371..22671b2c3 100644
--- a/roles/kubernetes/node/templates/kubelet-container.j2
+++ b/roles/kubernetes/node/templates/kubelet-container.j2
@@ -5,8 +5,8 @@
--privileged \
--name=kubelet \
--restart=on-failure:5 \
- --memory={{ kubelet_memory_limit|regex_replace('Mi', 'M') }} \
- --cpu-shares={{ kubelet_cpu_limit|regex_replace('m', '') }} \
+ --memory={{ kube_memory_reserved|regex_replace('Mi', 'M') }} \
+ --cpu-shares={{ kube_cpu_reserved|regex_replace('m', '') }} \
-v /dev:/dev:rw \
-v /etc/cni:/etc/cni:ro \
-v /opt/cni:/opt/cni:ro \
diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
index c8cf40e7b..f67c72bf8 100644
--- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
+++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
@@ -29,7 +29,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--cadvisor-port={{ kube_cadvisor_port }} \
{# end kubeadm specific settings #}
--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={{ 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 }} \
--
GitLab