Skip to content
Snippets Groups Projects
Unverified Commit 92e8ac9d authored by Max Gautier's avatar Max Gautier Committed by GitHub
Browse files

Remove tag 'master' (#12228)

* Remove tag master

Following it's deprecation in 4b324cb0 (Rename master to control plane
- non-breaking changes only (#11394), 2024-09-06)

* Add fail fast path when using removed tags

- Used for the master tag, but this could be used for other things in
  the future
parent 73b3e9b5
Branches
No related tags found
No related merge requests found
...@@ -118,7 +118,6 @@ The following tags are defined in playbooks: ...@@ -118,7 +118,6 @@ The following tags are defined in playbooks:
| local-path-provisioner | Configure External provisioner: local-path | | local-path-provisioner | Configure External provisioner: local-path |
| local-volume-provisioner | Configure External provisioner: local-volume | | local-volume-provisioner | Configure External provisioner: local-volume |
| macvlan | Network plugin macvlan | | macvlan | Network plugin macvlan |
| master (DEPRECATED) | Deprecated - see `control-plane` |
| metallb | Installing and configuring metallb | | metallb | Installing and configuring metallb |
| metrics_server | Configuring metrics_server | | metrics_server | Configuring metrics_server |
| netchecker | Installing netchecker K8s app | | netchecker | Installing netchecker K8s app |
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
environment: "{{ proxy_disable_env }}" environment: "{{ proxy_disable_env }}"
roles: roles:
- { role: kubespray_defaults } - { role: kubespray_defaults }
- { role: kubernetes/control-plane, tags: master } - { role: kubernetes/control-plane, tags: control-plane }
- { role: kubernetes/client, tags: client } - { role: kubernetes/client, tags: client }
- { role: kubernetes-apps/cluster_roles, tags: cluster-roles } - { role: kubernetes-apps/cluster_roles, tags: cluster-roles }
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
environment: "{{ proxy_disable_env }}" environment: "{{ proxy_disable_env }}"
roles: roles:
- { role: kubespray_defaults } - { role: kubespray_defaults }
- { role: win_nodes/kubernetes_patch, tags: ["master", "win_nodes"] } - { role: win_nodes/kubernetes_patch, tags: ["control-plane", "win_nodes"] }
- name: Install Kubernetes apps - name: Install Kubernetes apps
hosts: kube_control_plane hosts: kube_control_plane
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
- kube_network_plugin != "calico" or calico_datastore == "etcd" - kube_network_plugin != "calico" or calico_datastore == "etcd"
- ('k8s_cluster' in group_names) - ('k8s_cluster' in group_names)
tags: tags:
- master # master tag is deprecated and replaced by control-plane
- control-plane - control-plane
- network - network
...@@ -51,7 +50,6 @@ ...@@ -51,7 +50,6 @@
- kube_network_plugin != "calico" or calico_datastore == "etcd" - kube_network_plugin != "calico" or calico_datastore == "etcd"
- ('k8s_cluster' in group_names) - ('k8s_cluster' in group_names)
tags: tags:
- master # master tag is deprecated and replaced by control-plane
- control-plane - control-plane
- network - network
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
- bootstrap_os - bootstrap_os
- apps - apps
- network - network
- master # master tag is deprecated and replaced by control-plane
- control-plane - control-plane
- node - node
with_items: with_items:
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
- bootstrap_os - bootstrap_os
- apps - apps
- network - network
- master # master tag is deprecated and replaced by control-plane
- control-plane - control-plane
- node - node
with_items: with_items:
......
--- ---
# This should only contains check of the inventory itself, nothing depending on facts # This should only contains check of:
# - the inventory
# - extra variables
# - ansible commandline
# -> nothing depending on facts or similar cluster state
# Checks depending on current state (of the nodes or the cluster) # Checks depending on current state (of the nodes or the cluster)
# should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml # should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
- name: Stop if removed tags are used
assert:
msg: The tag 'master' is removed. Use 'control-plane' instead
that:
- ('master' not in ansible_run_tags)
- ('master' not in ansible_skip_tags)
# TODO: Remove checks after next release
- name: Stop if kube_control_plane group is empty - name: Stop if kube_control_plane group is empty
assert: assert:
that: groups.get( 'kube_control_plane' ) that: groups.get( 'kube_control_plane' )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment