From c09b07327b688a6a47f523a15c1a5c29d4f476d0 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 7 May 2022 22:45:49 +0200 Subject: k8s: rename masters to control-plane nodes --- common/kubernetes-cluster-layout.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'common/kubernetes-cluster-layout.yml') diff --git a/common/kubernetes-cluster-layout.yml b/common/kubernetes-cluster-layout.yml index bd972a6d..31751a8d 100644 --- a/common/kubernetes-cluster-layout.yml +++ b/common/kubernetes-cluster-layout.yml @@ -5,20 +5,20 @@ gather_facts: no run_once: yes tasks: - - name: sanity check - fail if masters are not included in nodes + - name: sanity check - fail if control-plane nodes are not included in node group assert: - msg: "the cluster node group '{{ kubernetes_cluster_layout.nodes_group }}' must include *all* nodes (master and non-master)" - that: kubernetes_cluster_layout.masters | difference(ansible_play_hosts_all) | length == 0 + msg: "the cluster node group '{{ kubernetes_cluster_layout.nodes_group }}' must include *all* nodes (control-plane and worker)" + that: kubernetes_cluster_layout.controlplane_nodes | difference(ansible_play_hosts_all) | length == 0 - - name: sanity check - fail if primary master is not in masters + - name: sanity check - fail if primary control-group node is not in control-group node list assert: - msg: "kubernetes_cluster_layout.masters must include kubernetes_cluster_layout.primary_master" - that: kubernetes_cluster_layout.primary_master is undefined or kubernetes_cluster_layout.primary_master in kubernetes_cluster_layout.masters + msg: "kubernetes_cluster_layout.controlplane_nodes must include kubernetes_cluster_layout.primary_controlplane_node" + that: kubernetes_cluster_layout.primary_controlplane_node is undefined or kubernetes_cluster_layout.primary_controlplane_node in kubernetes_cluster_layout.controlplane_nodes - - name: sanity check - fail on multiple masters if no primary master is configured + - name: sanity check - fail on multiple control-plane nodes but no primary is configured assert: - msg: "for multiple masters to work you need to define kubernetes_cluster_layout.primary_master" - that: (kubernetes_cluster_layout.masters | length) == 1 or kubernetes_cluster_layout.primary_master is defined + msg: "for multiple control-plane nodes to work you need to define kubernetes_cluster_layout.primary_controlplane_node" + that: (kubernetes_cluster_layout.controlplane_nodes | length) == 1 or kubernetes_cluster_layout.primary_controlplane_node is defined - name: create group for all kubernetes nodes loop: "{{ ansible_play_hosts_all }}" @@ -28,19 +28,19 @@ group: _kubernetes_nodes_ changed_when: False - - name: create group for kubernetes master nodes - loop: "{{ kubernetes_cluster_layout.masters }}" + - name: create group for kubernetes control-plane nodes + loop: "{{ kubernetes_cluster_layout.controlplane_nodes }}" add_host: name: "{{ item }}" inventory_dir: "{{ hostvars[item].inventory_dir }}" - group: _kubernetes_masters_ + group: _kubernetes_controlplane_nodes_ changed_when: False - - name: create group for kubernetes primary master + - name: create group for kubernetes primary control-plane node vars: - item: "{{ kubernetes_cluster_layout.primary_master | default(kubernetes_cluster_layout.masters[0]) }}" + item: "{{ kubernetes_cluster_layout.primary_controlplane_node | default(kubernetes_cluster_layout.controlplane_nodes[0]) }}" add_host: name: "{{ item }}" inventory_dir: "{{ hostvars[item].inventory_dir }}" - group: _kubernetes_primary_master_ + group: _kubernetes_primary_controlplane_node_ changed_when: False -- cgit v1.2.3