Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
50e3ccfa
Commit
50e3ccfa
authored
7 years ago
by
Dann Bohn
Browse files
Options
Downloads
Patches
Plain Diff
uses new kube_memory_reserved/kube_cpu_reserved variables in kubelt
parent
69a3c33c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/node/templates/kubelet-container.j2
+2
-2
2 additions, 2 deletions
roles/kubernetes/node/templates/kubelet-container.j2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
+1
-1
1 addition, 1 deletion
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
with
3 additions
and
3 deletions
roles/kubernetes/node/templates/kubelet-container.j2
+
2
−
2
View file @
50e3ccfa
...
...
@@ -5,8 +5,8 @@
--privileged
\
--name
=
kubelet
\
--restart
=
on-failure:5
\
--memory
={{
kube
let
_memory_
limit
|regex_replace
(
'Mi'
,
'M'
)
}}
\
--cpu-shares
={{
kube
let
_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
\
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
+
1
−
1
View file @
50e3ccfa
...
...
@@ -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={{ kube
let
_cpu_
limit
}},memory={{ kube
let
_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 }} \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment