mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-10-31 06:26:19 -02:30
Remove upgrade shims shipped in 2.31.0 and 2.32.0 (#13598)
* chore: remove upgrade shims shipped in 2.31.0 and 2.32.0 * fix(validate_inventory): anchor every name in the removed_vars regex Co-authored-by: Ali Afsharzadeh <afsharzadeh8@gmail.com> --------- Co-authored-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
co-authored by
Ali Afsharzadeh
parent
c58f0aff41
commit
622a1666ed
@@ -46,22 +46,3 @@
|
|||||||
with_items: "{{ node_feature_discovery_manifests.results }}"
|
with_items: "{{ node_feature_discovery_manifests.results }}"
|
||||||
when:
|
when:
|
||||||
- inventory_hostname == groups['kube_control_plane'][0]
|
- inventory_hostname == groups['kube_control_plane'][0]
|
||||||
|
|
||||||
# TODO: remove after the 2.32.0 release
|
|
||||||
- name: Node Feature Discovery | Remove obsolete master Service
|
|
||||||
kube:
|
|
||||||
name: node-feature-discovery-master
|
|
||||||
kubectl: "{{ bin_dir }}/kubectl"
|
|
||||||
resource: svc
|
|
||||||
namespace: "{{ node_feature_discovery_namespace }}"
|
|
||||||
state: absent
|
|
||||||
when:
|
|
||||||
- inventory_hostname == groups['kube_control_plane'][0]
|
|
||||||
|
|
||||||
# TODO: remove after the 2.32.0 release
|
|
||||||
- name: Node Feature Discovery | Remove obsolete master Service manifest
|
|
||||||
file:
|
|
||||||
path: "{{ kube_config_dir }}/addons/node_feature_discovery/nfd-service.yaml"
|
|
||||||
state: absent
|
|
||||||
when:
|
|
||||||
- inventory_hostname == groups['kube_control_plane'][0]
|
|
||||||
|
|||||||
@@ -9,13 +9,8 @@
|
|||||||
- name: Fail if removed variables are used
|
- name: Fail if removed variables are used
|
||||||
vars:
|
vars:
|
||||||
# Always remove items from this list after the release in comments
|
# Always remove items from this list after the release in comments
|
||||||
removed_vars:
|
removed_vars: []
|
||||||
- kubelet_static_pod_path # 2.31.0
|
removed_vars_found: "{{ query('varnames', '^(' + (removed_vars | join('|')) + ')$') }}"
|
||||||
- eviction_hard_control_plane # 2.31.0
|
|
||||||
- node_feature_discovery_enable_nodefeature_api # 2.32.0
|
|
||||||
- node_feature_discovery_master_crd_controller # 2.32.0
|
|
||||||
- node_feature_discovery_master_instance # 2.32.0
|
|
||||||
removed_vars_found: "{{ query('varnames', '^' + (removed_vars | join('|')) + '$') }}"
|
|
||||||
assert:
|
assert:
|
||||||
that: removed_vars_found | length == 0
|
that: removed_vars_found | length == 0
|
||||||
fail_msg: "Removed variables present: {{ removed_vars_found | join(', ') }}"
|
fail_msg: "Removed variables present: {{ removed_vars_found | join(', ') }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user