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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
54b1fe83
Commit
54b1fe83
authored
Jul 31, 2019
by
koriukiv
Committed by
Kubernetes Prow Robot
Jul 31, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Add an option to reserve resources for OS system daemons (#5007)
parent
5337cff1
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
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+9
-0
9 additions, 0 deletions
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
+11
-1
11 additions, 1 deletion
.../kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
with
20 additions
and
1 deletion
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+
9
−
0
View file @
54b1fe83
...
@@ -191,6 +191,15 @@ podsecuritypolicy_enabled: false
...
@@ -191,6 +191,15 @@ podsecuritypolicy_enabled: false
# Acceptable options are 'pods', 'system-reserved', 'kube-reserved' and ''. Default is "".
# Acceptable options are 'pods', 'system-reserved', 'kube-reserved' and ''. Default is "".
# kubelet_enforce_node_allocatable: pods
# kubelet_enforce_node_allocatable: pods
## Optionally reserve resources for OS system daemons.
# system_reserved: true
## Uncomment to override default values
# system_memory_reserved: 512M
# system_cpu_reserved: 500m
## Reservation for master hosts
# system_master_memory_reserved: 256M
# system_master_cpu_reserved: 250m
# An alternative flexvolume plugin directory
# An alternative flexvolume plugin directory
# kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
# kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
+
11
−
1
View file @
54b1fe83
...
@@ -54,4 +54,14 @@ kubeReserved:
...
@@ -54,4 +54,14 @@ kubeReserved:
cpu: {{ kube_cpu_reserved }}
cpu: {{ kube_cpu_reserved }}
memory: {{ kube_memory_reserved|regex_replace('Mi', 'M') }}
memory: {{ kube_memory_reserved|regex_replace('Mi', 'M') }}
{% endif %}
{% endif %}
{% if system_reserved is defined and system_reserved %}
systemReserved:
{% if is_kube_master|bool %}
cpu: {{ system_master_cpu_reserved|default('250m') }}
memory: {{ system_master_memory_reserved|default('256M')|regex_replace('Mi', 'M') }}
{% else %}
cpu: {{ system_cpu_reserved|default('500m') }}
memory: {{ system_memory_reserved|default('512M')|regex_replace('Mi', 'M') }}
{% endif %}
{% endif %}
resolvConf: "{{ kube_resolv_conf }}"
resolvConf: "{{ kube_resolv_conf }}"
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
sign in
to comment