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
3bb95426
Unverified
Commit
3bb95426
authored
2 years ago
by
h9-HSFRQDH
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Adding support for node & pod pid limit (#9038)
parent
1d0b3829
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/node/defaults/main.yml
+8
-0
8 additions, 0 deletions
roles/kubernetes/node/defaults/main.yml
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
+13
-0
13 additions, 0 deletions
.../kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
with
21 additions
and
0 deletions
roles/kubernetes/node/defaults/main.yml
+
8
−
0
View file @
3bb95426
...
...
@@ -26,20 +26,24 @@ kubelet_fail_swap_on: true
kube_memory_reserved
:
256Mi
kube_cpu_reserved
:
100m
# kube_ephemeral_storage_reserved: 2Gi
# kube_pid_reserved: 1000
# Reservation for master hosts
kube_master_memory_reserved
:
512Mi
kube_master_cpu_reserved
:
200m
# kube_master_ephemeral_storage_reserved: 2Gi
# kube_master_pid_reserved: 1000
# Set to true to reserve resources for system daemons
system_reserved
:
false
system_memory_reserved
:
512Mi
system_cpu_reserved
:
500m
# system_ephemeral_storage_reserved: 2Gi
# system_pid_reserved: 1000
# Reservation for master hosts
system_master_memory_reserved
:
256Mi
system_master_cpu_reserved
:
250m
# system_master_ephemeral_storage_reserved: 2Gi
# system_master_pid_reserved: 1000
## Eviction Thresholds to avoid system OOMs
# https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/#eviction-thresholds
...
...
@@ -92,6 +96,10 @@ kube_apiserver_node_port_range: "30000-32767"
# default is equal to application default
kubelet_max_pods
:
110
# Sets the maximum number of processes running per Pod
# Default value -1 = unlimited
kubelet_pod_pids_limit
:
-1
## Support parameters to be passed to kubelet via kubelet-config.yaml
kubelet_config_extra_args
:
{}
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
+
13
−
0
View file @
3bb95426
...
...
@@ -27,6 +27,7 @@ cgroupDriver: {{ kubelet_cgroup_driver | default('systemd') }}
containerLogMaxFiles: {{ kubelet_logfiles_max_nr }}
containerLogMaxSize: {{ kubelet_logfiles_max_size }}
maxPods: {{ kubelet_max_pods }}
podPidsLimit: {{ kubelet_pod_pids_limit }}
address: {{ kubelet_bind_address }}
readOnlyPort: {{ kube_read_only_port }}
healthzPort: {{ kubelet_healthz_port }}
...
...
@@ -66,12 +67,18 @@ kubeReserved:
{% if kube_master_ephemeral_storage_reserved is defined %}
ephemeral-storage: {{ kube_master_ephemeral_storage_reserved }}
{% endif %}
{% if kube_master_pid_reserved is defined %}
pid: {{ kube_master_pid_reserved }}
{% endif %}
{% else %}
cpu: {{ kube_cpu_reserved }}
memory: {{ kube_memory_reserved }}
{% if kube_ephemeral_storage_reserved is defined %}
ephemeral-storage: {{ kube_ephemeral_storage_reserved }}
{% endif %}
{% if kube_pid_reserved is defined %}
pid: {{ kube_pid_reserved }}
{% endif %}
{% endif %}
{% if system_reserved is defined and system_reserved %}
systemReserved:
...
...
@@ -81,12 +88,18 @@ systemReserved:
{% if system_master_ephemeral_storage_reserved is defined %}
ephemeral-storage: {{ system_master_ephemeral_storage_reserved }}
{% endif %}
{% if system_master_pid_reserved is defined %}
pid: {{ system_master_pid_reserved }}
{% endif %}
{% else %}
cpu: {{ system_cpu_reserved }}
memory: {{ system_memory_reserved }}
{% if system_ephemeral_storage_reserved is defined %}
ephemeral-storage: {{ system_ephemeral_storage_reserved }}
{% endif %}
{% if system_pid_reserved is defined %}
pid: {{ system_pid_reserved }}
{% endif %}
{% endif %}
{% endif %}
{% if is_kube_master|bool and eviction_hard_control_plane is defined and eviction_hard_control_plane %}
...
...
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