epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

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

This reverts commit 082507cff2.

* Add kubelet_static_pod_path to removed variables
This commit is contained in:
Max Gautier
2026-02-09 02:01:09 +00:00
committed by GitHub
parent 052846aa28
commit 34f43d21e3
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/operations/hardening.md
View File

@@ -100,8 +100,6 @@ kubelet_make_iptables_util_chains: true
kubelet_feature_gates: ["RotateKubeletServerCertificate=true"] kubelet_feature_gates: ["RotateKubeletServerCertificate=true"]
kubelet_seccomp_default: true kubelet_seccomp_default: true
kubelet_systemd_hardening: true kubelet_systemd_hardening: true
# To disable kubelet's staticPodPath (for nodes that don't use static pods like worker nodes)
kubelet_static_pod_path: ""
# In case you have multiple interfaces in your # In case you have multiple interfaces in your
# control plane nodes and you want to specify the right # control plane nodes and you want to specify the right
# IP addresses, kubelet_secure_addresses allows you # IP addresses, kubelet_secure_addresses allows you

3
roles/kubernetes/node/defaults/main.yml
View File

@@ -180,9 +180,6 @@ kube_proxy_ipvs_modules:
- ip_vs_wlc - ip_vs_wlc
- ip_vs_lc - 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 ## Enable distributed tracing for kubelet
kubelet_tracing: false kubelet_tracing: false
kubelet_tracing_endpoint: "[::]:4317" kubelet_tracing_endpoint: "[::]:4317"

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

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

4
roles/validate_inventory/tasks/main.yml
View File

@@ -8,7 +8,9 @@
# should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml # should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
- name: Fail if removed variables are used - name: Fail if removed variables are used
vars: 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('|')) + '$') }}" removed_vars_found: "{{ query('varnames', '^' + (removed_vars | join('|')) + '$') }}"
assert: assert:
that: removed_vars_found | length == 0 that: removed_vars_found | length == 0