Revert "kubelet: conditionalize staticPodPath location (#12433)" (#12970)

* Revert "kubelet: conditionalize staticPodPath location (#12433)"

This reverts commit 082507cff2.

* Add kubelet_static_pod_path to removed variables

roles/kubernetes/node/defaults/main.yml

@@ -180,9 +180,6 @@ kube_proxy_ipvs_modules:
   - ip_vs_wlc
   - ip_vs_lc
 
-# Set this option to "" (empty) to disable staticPodPath (See docs/operations/hardening.md)
-kubelet_static_pod_path: "{{ kube_manifest_dir }}"
-
 ## Enable distributed tracing for kubelet
 kubelet_tracing: false
 kubelet_tracing_endpoint: "[::]:4317"

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

@@ -22,7 +22,7 @@ enforceNodeAllocatable:
 - {{ item }}
 {% endfor %}
 {% endif %}
-staticPodPath: "{{ kubelet_static_pod_path }}"
+staticPodPath: {{ kube_manifest_dir }}
 cgroupDriver: {{ kubelet_cgroup_driver | default('systemd') }}
 containerLogMaxFiles: {{ kubelet_logfiles_max_nr }}
 containerLogMaxSize: {{ kubelet_logfiles_max_size }}

roles/validate_inventory/tasks/main.yml

@@ -8,7 +8,9 @@
 # should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
 - name: Fail if removed variables are used
   vars:
-    removed_vars: []
+    # Always remove items from this list after the release in comments
+    removed_vars:
+      - kubelet_static_pod_path # 2.31.0
     removed_vars_found: "{{ query('varnames', '^' + (removed_vars | join('|')) + '$') }}"
   assert:
     that: removed_vars_found | length == 0