Replace kube-master with kube_control_plane (#7256)

This replaces kube-master with kube_control_plane because of [1]:

  The Kubernetes project is moving away from wording that is
  considered offensive. A new working group WG Naming was created
  to track this work, and the word "master" was declared as offensive.
  A proposal was formalized for replacing the word "master" with
  "control plane". This means it should be removed from source code,
  documentation, and user-facing configuration from Kubernetes and
  its sub-projects.

NOTE: The reason why this changes it to kube_control_plane not
      kube-control-plane is for valid group names on ansible.

[1]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint/README.md#motivation

roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml

@@ -6,7 +6,7 @@
   ignore_errors: true
   when:
     - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Delete kubeadm CoreDNS
   kube:
@@ -17,7 +17,7 @@
     state: absent
   when:
     - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - createdby_annotation.stdout != 'kubespray'
 
 - name: Kubernetes Apps | Delete kubeadm Kube-DNS service
@@ -29,4 +29,4 @@
     state: absent
   when:
     - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/ansible/tasks/coredns.yml

@@ -20,7 +20,7 @@
     clusterIP: "{{ skydns_server }}"
   when:
     - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - coredns
 
@@ -38,6 +38,6 @@
     coredns_ordinal_suffix: "-secondary"
   when:
     - dns_mode == 'coredns_dual'
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - coredns

roles/kubernetes-apps/ansible/tasks/dashboard.yml

@@ -6,7 +6,7 @@
   with_items:
     - { file: dashboard.yml, type: deploy, name: kubernetes-dashboard }
   register: manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Start dashboard
   kube:
@@ -17,4 +17,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/ansible/tasks/main.yml

@@ -9,12 +9,12 @@
   until: result.status == 200
   retries: 20
   delay: 1
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Cleanup DNS
   import_tasks: cleanup_dns.yml
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
     - coredns
@@ -24,7 +24,7 @@
   import_tasks: "coredns.yml"
   when:
     - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - coredns
 
@@ -32,7 +32,7 @@
   import_tasks: "nodelocaldns.yml"
   when:
     - enable_nodelocaldns
-    - inventory_hostname == groups['kube-master'] | first
+    - inventory_hostname == groups['kube_control_plane'] | first
   tags:
     - nodelocaldns
 
@@ -50,7 +50,7 @@
     - "{{ nodelocaldns_manifests.results | default({}) }}"
   when:
     - dns_mode != 'none'
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   register: resource_result
   until: resource_result is succeeded

roles/kubernetes-apps/ansible/tasks/netchecker.yml

@@ -28,7 +28,7 @@
   with_items: "{{ netchecker_templates }}"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Start Netchecker Resources
   kube:
@@ -39,4 +39,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped

roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml

@@ -10,7 +10,7 @@
     secondaryclusterIP: "{{ skydns_server_secondary }}"
   when:
     - enable_nodelocaldns
-    - inventory_hostname == groups['kube-master'] | first
+    - inventory_hostname == groups['kube_control_plane'] | first
   tags:
     - nodelocaldns
     - coredns
@@ -39,7 +39,7 @@
       {%- endif -%}
   when:
     - enable_nodelocaldns
-    - inventory_hostname == groups['kube-master'] | first
+    - inventory_hostname == groups['kube_control_plane'] | first
   tags:
     - nodelocaldns
     - coredns

roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml

@@ -7,7 +7,7 @@
   template:
     src: controller-manager-config.yml.j2
     dest: "{{ kube_config_dir }}/controller-manager-config.yml"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: oci
 
 - name: "OCI Cloud Controller | Slurp Configuration"
@@ -18,14 +18,14 @@
 - name: "OCI Cloud Controller | Encode Configuration"
   set_fact:
     controller_manager_config_base64: "{{ controller_manager_config.content }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: oci
 
 - name: "OCI Cloud Controller | Generate Manifests"
   template:
     src: oci-cloud-provider.yml.j2
     dest: "{{ kube_config_dir }}/oci-cloud-provider.yml"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: oci
 
 - name: "OCI Cloud Controller | Apply Manifests"
@@ -33,5 +33,5 @@
     kubectl: "{{ bin_dir }}/kubectl"
     filename: "{{ kube_config_dir }}/oci-cloud-provider.yml"
     state: latest
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: oci

roles/kubernetes-apps/cluster_roles/tasks/main.yml

@@ -9,14 +9,14 @@
   until: result.status == 200
   retries: 10
   delay: 6
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Check AppArmor status
   command: which apparmor_parser
   register: apparmor_status
   when:
     - podsecuritypolicy_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   failed_when: false
 
 - name: Kubernetes Apps | Set apparmor_enabled
@@ -24,7 +24,7 @@
     apparmor_enabled: "{{ apparmor_status.rc == 0 }}"
   when:
     - podsecuritypolicy_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Render templates for PodSecurityPolicy
   template:
@@ -37,7 +37,7 @@
     - {file: psp-crb.yml, type: rolebinding, name: psp-crb}
   when:
     - podsecuritypolicy_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Add policies, roles, bindings for PodSecurityPolicy
   kube:
@@ -52,7 +52,7 @@
   delay: 6
   with_items: "{{ psp_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"
@@ -64,7 +64,7 @@
   register: node_crb_manifest
   when:
     - rbac_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Apply workaround to allow all nodes with cert O=system:nodes to register
   kube:
@@ -80,7 +80,7 @@
   when:
     - rbac_enabled
     - node_crb_manifest.changed
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Add webhook ClusterRole that grants access to proxy, stats, log, spec, and metrics on a kubelet
   template:
@@ -90,7 +90,7 @@
   when:
     - rbac_enabled
     - kubelet_authorization_mode_webhook
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags: node-webhook
 
 - name: Apply webhook ClusterRole
@@ -104,7 +104,7 @@
     - rbac_enabled
     - kubelet_authorization_mode_webhook
     - node_webhook_cr_manifest.changed
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags: node-webhook
 
 - name: Kubernetes Apps | Add ClusterRoleBinding for system:nodes to webhook ClusterRole
@@ -115,7 +115,7 @@
   when:
     - rbac_enabled
     - kubelet_authorization_mode_webhook
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags: node-webhook
 
 - name: Grant system:nodes the webhook ClusterRole
@@ -129,7 +129,7 @@
     - rbac_enabled
     - kubelet_authorization_mode_webhook
     - node_webhook_crb_manifest.changed
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags: node-webhook
 
 - include_tasks: oci.yml
@@ -140,7 +140,7 @@
 
 - name: PriorityClass | Copy k8s-cluster-critical-pc.yml file
   copy: src=k8s-cluster-critical-pc.yml dest={{ kube_config_dir }}/k8s-cluster-critical-pc.yml
-  when: inventory_hostname == groups['kube-master']|last
+  when: inventory_hostname == groups['kube_control_plane']|last
 
 - name: PriorityClass | Create k8s-cluster-critical
   kube:
@@ -149,4 +149,4 @@
     resource: "PriorityClass"
     filename: "{{ kube_config_dir }}/k8s-cluster-critical-pc.yml"
     state: latest
-  when: inventory_hostname == groups['kube-master']|last
+  when: inventory_hostname == groups['kube_control_plane']|last

roles/kubernetes-apps/cluster_roles/tasks/oci.yml

@@ -6,7 +6,7 @@
   when:
   - cloud_provider is defined
   - cloud_provider == 'oci'
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Apply OCI RBAC
   kube:
@@ -15,4 +15,4 @@
   when:
   - cloud_provider is defined
   - cloud_provider == 'oci'
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/container_engine_accelerator/nvidia_gpu/tasks/main.yml

@@ -38,7 +38,7 @@
     - { name: k8s-device-plugin-nvidia-daemonset, file: k8s-device-plugin-nvidia-daemonset.yml, type: daemonset }
   register: container_engine_accelerator_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0] and nvidia_driver_install_container
+    - inventory_hostname == groups['kube_control_plane'][0] and nvidia_driver_install_container
 
 - name: Container Engine Acceleration Nvidia GPU | Apply manifests for nvidia accelerators
   kube:
@@ -51,4 +51,4 @@
   with_items:
     - "{{ container_engine_accelerator_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0] and nvidia_driver_install_container and nvidia_driver_install_supported
+    - inventory_hostname == groups['kube_control_plane'][0] and nvidia_driver_install_container and nvidia_driver_install_supported

roles/kubernetes-apps/container_runtimes/crun/tasks/main.yaml

@@ -6,7 +6,7 @@
     dest: "{{ kube_config_dir }}/runtimeclass-crun.yml"
     mode: "0664"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: crun | Apply manifests
   kube:
@@ -16,4 +16,4 @@
     filename: "{{ kube_config_dir }}/runtimeclass-crun.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/container_runtimes/kata_containers/tasks/main.yaml

@@ -20,7 +20,7 @@
   with_items: "{{ kata_containers_templates }}"
   register: kata_containers_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kata Containers | Apply manifests
   kube:
@@ -31,4 +31,4 @@
     state: "latest"
   with_items: "{{ kata_containers_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml

@@ -9,7 +9,7 @@
     - {name: aws-ebs-csi-controllerservice, file: aws-ebs-csi-controllerservice.yml}
     - {name: aws-ebs-csi-nodeservice, file: aws-ebs-csi-nodeservice.yml}
   register: aws_csi_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: aws-ebs-csi-driver
 
 - name: AWS CSI Driver | Apply Manifests
@@ -20,7 +20,7 @@
   with_items:
     - "{{ aws_csi_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml

@@ -8,14 +8,14 @@
     dest: "{{ kube_config_dir }}/azure_csi_cloud_config"
     group: "{{ kube_cert_group }}"
     mode: 0640
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: azure-csi-driver
 
 - name: Azure CSI Driver | Get base64 cloud-config
   slurp:
     src: "{{ kube_config_dir }}/azure_csi_cloud_config"
   register: cloud_config_secret
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: azure-csi-driver
 
 - name: Azure CSI Driver | Generate Manifests
@@ -30,7 +30,7 @@
     - {name: azure-csi-azuredisk-node, file: azure-csi-azuredisk-node.yml}
     - {name: azure-csi-node-info-crd.yml.j2, file: azure-csi-node-info-crd.yml}
   register: azure_csi_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: azure-csi-driver
 
 - name: Azure CSI Driver | Apply Manifests
@@ -41,7 +41,7 @@
   with_items:
     - "{{ azure_csi_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml

@@ -20,14 +20,14 @@
     dest: "{{ kube_config_dir }}/cinder_cloud_config"
     group: "{{ kube_cert_group }}"
     mode: 0640
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: cinder-csi-driver
 
 - name: Cinder CSI Driver | Get base64 cloud-config
   slurp:
     src: "{{ kube_config_dir }}/cinder_cloud_config"
   register: cloud_config_secret
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: cinder-csi-driver
 
 - name: Cinder CSI Driver | Generate Manifests
@@ -43,7 +43,7 @@
     - {name: cinder-csi-nodeplugin, file: cinder-csi-nodeplugin.yml}
     - {name: cinder-csi-poddisruptionbudget, file: cinder-csi-poddisruptionbudget.yml}
   register: cinder_csi_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: cinder-csi-driver
 
 - name: Cinder CSI Driver | Apply Manifests
@@ -54,7 +54,7 @@
   with_items:
     - "{{ cinder_csi_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml

@@ -8,7 +8,7 @@
     - {name: volumesnapshotcontents, file: volumesnapshotcontents.yml}
     - {name: volumesnapshots, file: volumesnapshots.yml}
   register: csi_crd_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: csi-driver
 
 - name: CSI CRD | Apply Manifests
@@ -20,7 +20,7 @@
   with_items:
     - "{{ csi_crd_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml

@@ -11,14 +11,14 @@
     dest: "{{ kube_config_dir }}/cloud-sa.json"
     group: "{{ kube_cert_group }}"
     mode: 0640
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: gcp-pd-csi-driver
 
 - name: GCP PD CSI Driver | Get base64 cloud-sa.json
   slurp:
     src: "{{ kube_config_dir }}/cloud-sa.json"
   register: gcp_cred_secret
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: gcp-pd-csi-driver
 
 - name: GCP PD CSI Driver | Generate Manifests
@@ -31,7 +31,7 @@
     - {name: gcp-pd-csi-controller, file: gcp-pd-csi-controller.yml}
     - {name: gcp-pd-csi-node, file: gcp-pd-csi-node.yml}
   register: gcp_pd_csi_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: gcp-pd-csi-driver
 
 - name: GCP PD CSI Driver | Apply Manifests
@@ -42,7 +42,7 @@
   with_items:
     - "{{ gcp_pd_csi_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml

@@ -9,7 +9,7 @@
     mode: 0640
   with_items:
     - vsphere-csi-cloud-config
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: vsphere-csi-driver
 
 - name: vSphere CSI Driver | Generate Manifests
@@ -21,13 +21,13 @@
     - vsphere-csi-controller-ss.yml
     - vsphere-csi-node.yml
   register: vsphere_csi_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: vsphere-csi-driver
 
 - name: vSphere CSI Driver | Generate a CSI secret manifest
   command: "{{ bin_dir }}/kubectl create secret generic vsphere-config-secret --from-file=csi-vsphere.conf={{ kube_config_dir }}/vsphere-csi-cloud-config -n kube-system --dry-run --save-config -o yaml"
   register: vsphere_csi_secret_manifest
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   no_log: true
   tags: vsphere-csi-driver
 
@@ -35,7 +35,7 @@
   command:
     cmd: "{{ bin_dir }}/kubectl apply -f -"
     stdin: "{{ vsphere_csi_secret_manifest.stdout }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   no_log: true
   tags: vsphere-csi-driver
 
@@ -47,7 +47,7 @@
   with_items:
     - "{{ vsphere_csi_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item }}"

roles/kubernetes-apps/external_cloud_controller/meta/main.yml

@@ -6,7 +6,7 @@ dependencies:
       - cloud_provider == "external"
       - external_cloud_provider is defined
       - external_cloud_provider == "openstack"
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - external-cloud-controller
       - external-openstack
@@ -16,7 +16,7 @@ dependencies:
       - cloud_provider == "external"
       - external_cloud_provider is defined
       - external_cloud_provider == "vsphere"
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - external-cloud-controller
       - external-vsphere

roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml

@@ -20,14 +20,14 @@
     dest: "{{ kube_config_dir }}/external_openstack_cloud_config"
     group: "{{ kube_cert_group }}"
     mode: 0640
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-openstack
 
 - name: External OpenStack Cloud Controller | Get base64 cloud-config
   slurp:
     src: "{{ kube_config_dir }}/external_openstack_cloud_config"
   register: external_openstack_cloud_config_secret
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-openstack
 
 - name: External OpenStack Cloud Controller | Generate Manifests
@@ -42,7 +42,7 @@
     - {name: external-openstack-cloud-controller-manager-role-bindings, file: external-openstack-cloud-controller-manager-role-bindings.yml}
     - {name: external-openstack-cloud-controller-manager-ds, file: external-openstack-cloud-controller-manager-ds.yml}
   register: external_openstack_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-openstack
 
 - name: External OpenStack Cloud Controller | Apply Manifests
@@ -53,7 +53,7 @@
   with_items:
     - "{{ external_openstack_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml

@@ -9,7 +9,7 @@
     mode: 0640
   with_items:
     - external-vsphere-cpi-cloud-config
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-vsphere
 
 - name: External vSphere Cloud Controller | Generate Manifests
@@ -22,20 +22,20 @@
     - external-vsphere-cloud-controller-manager-role-bindings.yml
     - external-vsphere-cloud-controller-manager-ds.yml
   register: external_vsphere_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-vsphere
 
 - name: External vSphere Cloud Provider Interface | Create a CPI configMap manifest
   command: "{{ bin_dir }}/kubectl create configmap cloud-config --from-file=vsphere.conf={{ kube_config_dir }}/external-vsphere-cpi-cloud-config -n kube-system --dry-run --save-config -o yaml"
   register: external_vsphere_configmap_manifest
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-vsphere
 
 - name: External vSphere Cloud Provider Interface | Apply a CPI configMap manifest
   command:
     cmd: "{{ bin_dir }}/kubectl apply -f -"
     stdin: "{{ external_vsphere_configmap_manifest.stdout }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: external-vsphere
 
 - name: External vSphere Cloud Controller | Apply Manifests
@@ -46,7 +46,7 @@
   with_items:
     - "{{ external_vsphere_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item }}"

roles/kubernetes-apps/external_provisioner/cephfs_provisioner/tasks/main.yml

@@ -5,7 +5,7 @@
     path: "{{ kube_config_dir }}/addons/cephfs_provisioner"
     state: absent
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -14,7 +14,7 @@
     {{ bin_dir }}/kubectl delete namespace {{ cephfs_provisioner_namespace }}
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -23,7 +23,7 @@
     {{ bin_dir }}/kubectl delete storageclass {{ cephfs_provisioner_storage_class }}
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -35,7 +35,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: CephFS Provisioner | Templates list
   set_fact:
@@ -65,7 +65,7 @@
     dest: "{{ kube_config_dir }}/addons/cephfs_provisioner/{{ item.file }}"
   with_items: "{{ cephfs_provisioner_templates }}"
   register: cephfs_provisioner_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: CephFS Provisioner | Apply manifests
   kube:
@@ -76,4 +76,4 @@
     filename: "{{ kube_config_dir }}/addons/cephfs_provisioner/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ cephfs_provisioner_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/external_provisioner/local_path_provisioner/tasks/main.yml

@@ -7,7 +7,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Local Path Provisioner | Create claim root dir
   file:
@@ -42,7 +42,7 @@
     dest: "{{ kube_config_dir }}/addons/local_path_provisioner/{{ item.file }}"
   with_items: "{{ local_path_provisioner_templates }}"
   register: local_path_provisioner_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Local Path Provisioner | Apply manifests
   kube:
@@ -53,4 +53,4 @@
     filename: "{{ kube_config_dir }}/addons/local_path_provisioner/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ local_path_provisioner_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/external_provisioner/local_volume_provisioner/tasks/main.yml

@@ -42,7 +42,7 @@
     dest: "{{ kube_config_dir }}/addons/local_volume_provisioner/{{ item.file }}"
   with_items: "{{ local_volume_provisioner_templates }}"
   register: local_volume_provisioner_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Local Volume Provisioner | Apply manifests
   kube:
@@ -53,6 +53,6 @@
     filename: "{{ kube_config_dir }}/addons/local_volume_provisioner/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ local_volume_provisioner_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/external_provisioner/meta/main.yml

@@ -3,7 +3,7 @@ dependencies:
   - role: kubernetes-apps/external_provisioner/local_volume_provisioner
     when:
       - local_volume_provisioner_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - apps
       - local-volume-provisioner

roles/kubernetes-apps/external_provisioner/rbd_provisioner/tasks/main.yml

@@ -5,7 +5,7 @@
     path: "{{ kube_config_dir }}/addons/rbd_provisioner"
     state: absent
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -14,7 +14,7 @@
     {{ bin_dir }}/kubectl delete namespace {{ rbd_provisioner_namespace }}
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -23,7 +23,7 @@
     {{ bin_dir }}/kubectl delete storageclass {{ rbd_provisioner_storage_class }}
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -35,7 +35,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: RBD Provisioner | Templates list
   set_fact:
@@ -65,7 +65,7 @@
     dest: "{{ kube_config_dir }}/addons/rbd_provisioner/{{ item.file }}"
   with_items: "{{ rbd_provisioner_templates }}"
   register: rbd_provisioner_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: RBD Provisioner | Apply manifests
   kube:
@@ -76,4 +76,4 @@
     filename: "{{ kube_config_dir }}/addons/rbd_provisioner/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ rbd_provisioner_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/ingress_controller/alb_ingress_controller/tasks/main.yml

@@ -20,7 +20,7 @@
     - { name: alb-ingress-deploy, file: alb-ingress-deploy.yml, type: deploy }
   register: alb_ingress_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: ALB Ingress Controller | Apply manifests
   kube:
@@ -32,4 +32,4 @@
     state: "latest"
   with_items: "{{ alb_ingress_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/ingress_controller/ambassador/tasks/main.yml

@@ -8,7 +8,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Ambassador | Templates list
   set_fact:
@@ -29,7 +29,7 @@
   loop: "{{ ingress_ambassador_templates }}"
   register: ingress_ambassador_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Ambassador | Apply manifests
   kube:
@@ -41,7 +41,7 @@
     state: "latest"
   loop: "{{ ingress_ambassador_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 # load the AmbassadorInstallation _after_ the CustomResourceDefinition has been loaded
 
@@ -57,7 +57,7 @@
   loop: "{{ ingress_ambassador_cr_templates }}"
   register: ingress_ambassador_cr_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Ambassador | Apply AmbassadorInstallation
   kube:
@@ -69,4 +69,4 @@
     state: "latest"
   loop: "{{ ingress_ambassador_cr_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/ingress_controller/cert_manager/tasks/main.yml

@@ -5,7 +5,7 @@
     path: "{{ kube_config_dir }}/addons/cert_manager"
     state: absent
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -14,7 +14,7 @@
     {{ bin_dir }}/kubectl delete namespace {{ cert_manager_namespace }}
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -26,7 +26,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Cert Manager | Templates list
   set_fact:
@@ -54,7 +54,7 @@
   with_items: "{{ cert_manager_templates }}"
   register: cert_manager_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Cert Manager | Apply manifests
   kube:
@@ -65,12 +65,12 @@
     state: "latest"
   with_items: "{{ cert_manager_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Cert Manager | Wait for Webhook pods become ready
   command: "{{ bin_dir }}/kubectl wait po --namespace={{ cert_manager_namespace }} --selector app=webhook --for=condition=Ready --timeout=600s"
   register: cert_manager_webhook_pods_ready
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Cert Manager | Create ClusterIssuer manifest
   template:
@@ -78,7 +78,7 @@
     dest: "{{ kube_config_dir }}/addons/cert_manager/clusterissuer-cert-manager.yml"
   register: cert_manager_clusterissuer_manifest
   when:
-    - inventory_hostname == groups['kube-master'][0] and cert_manager_webhook_pods_ready is succeeded
+    - inventory_hostname == groups['kube_control_plane'][0] and cert_manager_webhook_pods_ready is succeeded
 
 - name: Cert Manager | Apply ClusterIssuer manifest
   kube:
@@ -86,4 +86,4 @@
     kubectl: "{{ bin_dir }}/kubectl"
     filename: "{{ kube_config_dir }}/addons/cert_manager/clusterissuer-cert-manager.yml"
     state: "latest"
-  when: inventory_hostname == groups['kube-master'][0] and cert_manager_clusterissuer_manifest is succeeded
+  when: inventory_hostname == groups['kube_control_plane'][0] and cert_manager_clusterissuer_manifest is succeeded

roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml

@@ -8,7 +8,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: NGINX Ingress Controller | Templates list
   set_fact:
@@ -38,7 +38,7 @@
   with_items: "{{ ingress_nginx_templates }}"
   register: ingress_nginx_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: NGINX Ingress Controller | Apply manifests
   kube:
@@ -50,4 +50,4 @@
     state: "latest"
   with_items: "{{ ingress_nginx_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/meta/main.yml

@@ -2,7 +2,7 @@
 dependencies:
   - role: kubernetes-apps/ansible
     when:
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
 
   - role: kubernetes-apps/helm
     when:
@@ -13,21 +13,21 @@ dependencies:
   - role: kubernetes-apps/registry
     when:
       - registry_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - registry
 
   - role: kubernetes-apps/metrics_server
     when:
       - metrics_server_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - metrics_server
 
   - role: kubernetes-apps/csi_driver/csi_crd
     when:
       - cinder_csi_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - csi-driver
 
@@ -69,19 +69,19 @@ dependencies:
   - role: kubernetes-apps/persistent_volumes
     when:
       - persistent_volumes_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - persistent_volumes
 
   - role: kubernetes-apps/snapshots
-    when: inventory_hostname == groups['kube-master'][0]
+    when: inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - snapshots
       - csi-driver
 
   - role: kubernetes-apps/container_runtimes
     when:
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - container-runtimes
 
@@ -94,13 +94,13 @@ dependencies:
     when:
       - cloud_provider is defined
       - cloud_provider == "oci"
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - oci
 
   - role: kubernetes-apps/metallb
     when:
       - metallb_enabled
-      - inventory_hostname == groups['kube-master'][0]
+      - inventory_hostname == groups['kube_control_plane'][0]
     tags:
       - metallb

roles/kubernetes-apps/metallb/tasks/main.yml

@@ -22,7 +22,7 @@
   register: apparmor_status
   when:
     - podsecuritypolicy_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   failed_when: false
 
 - name: Kubernetes Apps | Set apparmor_enabled
@@ -30,7 +30,7 @@
     apparmor_enabled: "{{ apparmor_status.rc == 0 }}"
   when:
     - podsecuritypolicy_enabled
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: "Kubernetes Apps | Lay Down MetalLB"
   become: true
@@ -38,7 +38,7 @@
   with_items: ["metallb.yml", "metallb-config.yml"]
   register: "rendering"
   when:
-    - "inventory_hostname == groups['kube-master'][0]"
+    - "inventory_hostname == groups['kube_control_plane'][0]"
 
 - name: "Kubernetes Apps | Install and configure MetalLB"
   kube:
@@ -49,7 +49,7 @@
   become: true
   with_items: "{{ rendering.results }}"
   when:
-    - "inventory_hostname == groups['kube-master'][0]"
+    - "inventory_hostname == groups['kube_control_plane'][0]"
 
 - name: Kubernetes Apps | Check existing secret of MetalLB
   command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf -n metallb-system get secret memberlist"
@@ -57,18 +57,18 @@
   become: true
   ignore_errors: yes
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Apps | Create random bytes for MetalLB
   command: "openssl rand -base64 32"
   register: metallb_rand
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - metallb_secret.rc != 0
 
 - name: Kubernetes Apps | Install secret of MetalLB if not existing
   command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf -n metallb-system create secret generic memberlist --from-literal=secretkey={{ metallb_rand.stdout }}"
   become: true
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - metallb_secret.rc != 0

roles/kubernetes-apps/metrics_server/tasks/main.yml

@@ -2,14 +2,14 @@
 # If all masters have node role, there are no tainted master and toleration should not be specified.
 - name: Check all masters are node or not
   set_fact:
-    masters_are_not_tainted: "{{ groups['kube-node'] | intersect(groups['kube-master']) == groups['kube-master'] }}"
+    masters_are_not_tainted: "{{ groups['kube-node'] | intersect(groups['kube_control_plane']) == groups['kube_control_plane'] }}"
 
 - name: Metrics Server | Delete addon dir
   file:
     path: "{{ kube_config_dir }}/addons/metrics_server"
     state: absent
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - upgrade
 
@@ -21,7 +21,7 @@
     group: root
     mode: 0755
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Metrics Server | Templates list
   set_fact:
@@ -43,7 +43,7 @@
   with_items: "{{ metrics_server_templates }}"
   register: metrics_server_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Metrics Server | Apply manifests
   kube:
@@ -54,4 +54,4 @@
     state: "latest"
   with_items: "{{ metrics_server_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/network_plugin/canal/tasks/main.yml

@@ -8,4 +8,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ canal_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped

roles/kubernetes-apps/network_plugin/cilium/tasks/main.yml

@@ -8,7 +8,7 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ cilium_node_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped
 
 - name: Cilium | Wait for pods to run
   command: "{{ bin_dir }}/kubectl -n kube-system get pods -l k8s-app=cilium -o jsonpath='{.items[?(@.status.containerStatuses[0].ready==false)].metadata.name}'"  # noqa 601
@@ -17,4 +17,4 @@
   retries: 30
   delay: 10
   ignore_errors: yes
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/network_plugin/flannel/tasks/main.yml

@@ -8,7 +8,7 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ flannel_node_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped
 
 - name: Flannel | Wait for flannel subnet.env file presence
   wait_for:

roles/kubernetes-apps/network_plugin/kube-ovn/tasks/main.yml

@@ -6,4 +6,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ kube_ovn_node_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped

roles/kubernetes-apps/network_plugin/kube-router/tasks/main.yml

@@ -8,7 +8,7 @@
     resource: "ds"
     namespace: "kube-system"
     state: "latest"
-  delegate_to: "{{ groups['kube-master'] | first }}"
+  delegate_to: "{{ groups['kube_control_plane'] | first }}"
   run_once: true
 
 - name: kube-router | Wait for kube-router pods to be ready
@@ -18,6 +18,6 @@
   retries: 30
   delay: 10
   ignore_errors: yes
-  delegate_to: "{{ groups['kube-master'] | first }}"
+  delegate_to: "{{ groups['kube_control_plane'] | first }}"
   run_once: true
   changed_when: false

roles/kubernetes-apps/network_plugin/multus/tasks/main.yml

@@ -8,4 +8,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ multus_manifest_1.results }} + {{ multus_manifest_2.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped

roles/kubernetes-apps/network_plugin/ovn4nfv/tasks/main.yml

@@ -6,4 +6,4 @@
     filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ ovn4nfv_node_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0] and not item is skipped
+  when: inventory_hostname == groups['kube_control_plane'][0] and not item is skipped

roles/kubernetes-apps/network_plugin/weave/tasks/main.yml

@@ -8,7 +8,7 @@
     resource: "ds"
     namespace: "kube-system"
     state: "latest"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Weave | Wait for Weave to become available
   uri:
@@ -18,4 +18,4 @@
   retries: 180
   delay: 5
   until: "weave_status.status == 200 and 'Status: ready' in weave_status.content"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/persistent_volumes/aws-ebs-csi/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/aws-ebs-csi-storage-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Persistent Volumes | Add AWS EBS CSI Storage Class
   kube:
@@ -15,5 +15,5 @@
     filename: "{{ kube_config_dir }}/aws-ebs-csi-storage-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/persistent_volumes/azuredisk-csi/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/azure-csi-storage-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Persistent Volumes | Add Azure CSI Storage Class
   kube:
@@ -15,5 +15,5 @@
     filename: "{{ kube_config_dir }}/azure-csi-storage-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/persistent_volumes/cinder-csi/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/cinder-csi-storage-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Persistent Volumes | Add Cinder CSI Storage Class
   kube:
@@ -15,5 +15,5 @@
     filename: "{{ kube_config_dir }}/cinder-csi-storage-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/persistent_volumes/gcp-pd-csi/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/gcp-pd-csi-storage-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Persistent Volumes | Add GCP PD CSI Storage Class
   kube:
@@ -15,5 +15,5 @@
     filename: "{{ kube_config_dir }}/gcp-pd-csi-storage-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/persistent_volumes/openstack/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/openstack-storage-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Persistent Volumes | Add OpenStack Cinder Storage Class
   kube:
@@ -15,5 +15,5 @@
     filename: "{{ kube_config_dir }}/openstack-storage-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/policy_controller/calico/tasks/main.yml

@@ -19,7 +19,7 @@
     - {name: calico-kube-controllers, file: calico-kube-crb.yml, type: clusterrolebinding}
   register: calico_kube_manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - rbac_enabled or item.type not in rbac_resources
 
 - name: Start of Calico kube controllers
@@ -33,7 +33,7 @@
   with_items:
     - "{{ calico_kube_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"

roles/kubernetes-apps/registry/tasks/main.yml

@@ -38,7 +38,7 @@
     dest: "{{ kube_config_dir }}/addons/registry/{{ item.file }}"
   with_items: "{{ registry_templates }}"
   register: registry_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Registry | Apply manifests
   kube:
@@ -49,7 +49,7 @@
     filename: "{{ kube_config_dir }}/addons/registry/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ registry_manifests.results }}"
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Registry | Create PVC manifests
   template:
@@ -61,7 +61,7 @@
   when:
     - registry_storage_class != none and registry_storage_class
     - registry_disk_size != none and registry_disk_size
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Registry | Apply PVC manifests
   kube:
@@ -75,4 +75,4 @@
   when:
     - registry_storage_class != none and registry_storage_class
     - registry_disk_size != none and registry_disk_size
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]

roles/kubernetes-apps/snapshots/cinder-csi/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: "{{ kube_config_dir }}/cinder-csi-snapshot-class.yml"
   register: manifests
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Kubernetes Snapshots | Add Cinder CSI Snapshot Class
   kube:
@@ -13,5 +13,5 @@
     filename: "{{ kube_config_dir }}/cinder-csi-snapshot-class.yml"
     state: "latest"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - manifests.changed

roles/kubernetes-apps/snapshots/snapshot-controller/tasks/main.yml

@@ -7,7 +7,7 @@
     - {name: rbac-snapshot-controller, file: rbac-snapshot-controller.yml}
     - {name: snapshot-controller, file: snapshot-controller.yml}
   register: snapshot_controller_manifests
-  when: inventory_hostname == groups['kube-master'][0]
+  when: inventory_hostname == groups['kube_control_plane'][0]
   tags: snapshot-controller
 
 - name: Snapshot Controller | Apply Manifests
@@ -18,7 +18,7 @@
   with_items:
     - "{{ snapshot_controller_manifests.results }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
     - not item is skipped
   loop_control:
     label: "{{ item.item.file }}"