Browse Source

feat: add eviction hard to kubelet config (#8421)

Signed-off-by: Cyril Corbon <corboncyril@gmail.com>
pull/8464/head
cyril-corbon 2 years ago
committed by GitHub
parent
commit
575e0ca457
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
  1. 5
      inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
  2. 5
      roles/kubernetes/node/defaults/main.yml
  3. 7
      roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2

5
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml

@ -254,6 +254,11 @@ podsecuritypolicy_enabled: false
# system_master_memory_reserved: 256Mi
# system_master_cpu_reserved: 250m
## Eviction Thresholds to avoid system OOMs
# https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/#eviction-thresholds
# eviction_hard: {}
# eviction_hard_control_plane: {}
# An alternative flexvolume plugin directory
# kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec

5
roles/kubernetes/node/defaults/main.yml

@ -40,6 +40,11 @@ system_cpu_reserved: 500m
system_master_memory_reserved: 256Mi
system_master_cpu_reserved: 250m
## Eviction Thresholds to avoid system OOMs
# https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/#eviction-thresholds
eviction_hard: {}
eviction_hard_control_plane: {}
kubelet_status_update_frequency: 10s
# Requests for load balancer app

7
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2

@ -77,6 +77,13 @@ systemReserved:
memory: {{ system_memory_reserved }}
{% endif %}
{% endif %}
{% if is_kube_master|bool and eviction_hard_control_plane is defined and eviction_hard_control_plane %}
evictionHard:
{{ eviction_hard_control_plane | to_nice_yaml(indent=2) }}
{% elif not is_kube_master|bool and eviction_hard is defined and eviction_hard %}
evictionHard:
{{ eviction_hard | to_nice_yaml(indent=2) }}
{% endif %}
resolvConf: "{{ kube_resolv_conf }}"
{% if kubelet_config_extra_args %}
{{ kubelet_config_extra_args | to_nice_yaml(indent=2) }}

Loading…
Cancel
Save