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

Signed-off-by: Cyril Corbon <[email protected]>
southbridgeio · Oct 20, 2023 · d8e3977 · d8e3977
1 parent 0eb2613
commit d8e3977
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/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
 

diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
@@ -50,6 +50,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
 
 # Limits for kube components

diff --git a/roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2 b/roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
@@ -82,6 +82,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) }}