From 4ee4ced06590807c6095a331ee9a4b9f29f11c64 Mon Sep 17 00:00:00 2001
From: tophac <90830648+tophac@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:33:24 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=88#13396=EF=BC=89Delete=20the=20lefto?=
 =?UTF-8?q?ver=20eviction=5Fhard=5Fcontrol=5Fplane=20variable=20(#13400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml | 1 -
 roles/kubernetes/node/defaults/main.yml                 | 1 -
 roles/validate_inventory/tasks/main.yml                 | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
index 881e244d0..36b6338ae 100644
--- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
@@ -293,7 +293,6 @@ default_kubelet_config_dir: "{{ kube_config_dir }}/dynamic_kubelet_dir"
 ## 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
index 015aa1d97..356c38597 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -56,7 +56,6 @@ system_pid_reserved: 1000
 ## 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
 
diff --git a/roles/validate_inventory/tasks/main.yml b/roles/validate_inventory/tasks/main.yml
index c05a1650e..37bdcd6e9 100644
--- a/roles/validate_inventory/tasks/main.yml
+++ b/roles/validate_inventory/tasks/main.yml
@@ -11,6 +11,7 @@
     # Always remove items from this list after the release in comments
     removed_vars:
       - kubelet_static_pod_path # 2.31.0
+      - eviction_hard_control_plane # 2.31.0
     removed_vars_found: "{{ query('varnames', '^' + (removed_vars | join('|')) + '$') }}"
   assert:
     that: removed_vars_found | length == 0