diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/kubernetes-cluster-cleanup.yml (renamed from common/kubernetes-cleanup.yml) | 0 | ||||
-rw-r--r-- | common/kubernetes-cluster-layout.yml | 2 | ||||
-rw-r--r-- | common/kubernetes-cluster.yml (renamed from common/kubernetes.yml) | 17 |
3 files changed, 8 insertions, 11 deletions
diff --git a/common/kubernetes-cleanup.yml b/common/kubernetes-cluster-cleanup.yml index 83d6945c..83d6945c 100644 --- a/common/kubernetes-cleanup.yml +++ b/common/kubernetes-cluster-cleanup.yml diff --git a/common/kubernetes-cluster-layout.yml b/common/kubernetes-cluster-layout.yml index 64856fc5..bd972a6d 100644 --- a/common/kubernetes-cluster-layout.yml +++ b/common/kubernetes-cluster-layout.yml @@ -17,7 +17,7 @@ - name: sanity check - fail on multiple masters if no primary master is configured assert: - msg: "For multiple masters to work you need to define kubernetes_cluster_layout.primary_master" + 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 - name: create group for all kubernetes nodes diff --git a/common/kubernetes.yml b/common/kubernetes-cluster.yml index d970c1fe..31b7bbf4 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes-cluster.yml @@ -2,7 +2,6 @@ - name: prepare variables and do some sanity checks hosts: _kubernetes_nodes_ gather_facts: no - run_once: yes tasks: - name: sanity checks for kubeguard when: kubernetes_network_plugin == 'kubeguard' @@ -22,17 +21,15 @@ msg: "At least one node_index is < 1 (indizes start at 1)" that: (kubeguard.node_index.values() | min) > 0 - - name: check whether overlay node io is configured > 0 + - name: check whether overlay node ip is configured assert: msg: "For kubeguard to work you need to configure kubernetes_overlay_node_ip" that: kubernetes_overlay_node_ip is defined - - name: make sure the kubernetes_cri_socket variable is configured correctly - when: kubernetes_container_runtime == 'containerd' + - name: make sure all nodes do belong to the kubernetes-cluster group assert: - msg: "The variable kubernetes_cri_socket is not configured correctly for use with containerd!" - that: - - kubernetes_cri_socket == "unix:///run/containerd/containerd.sock" + msg: "The host '{{ inventory_hostname }}' does not belong to the group 'kubernetes-cluster'" + that: "'kubernetes-cluster' in group_names" ######## - name: kubernetes base installation @@ -45,12 +42,12 @@ - role: kubernetes/base - role: kubernetes/kubeadm/base -- name: configure kubernetes primary master +- name: configure primary kubernetes master hosts: _kubernetes_primary_master_ roles: - - role: kubernetes/kubeadm/master + - role: kubernetes/kubeadm/masterg -- name: configure kubernetes secondary masters +- name: configure secondary kubernetes masters hosts: _kubernetes_masters_:!_kubernetes_primary_master_ roles: - role: kubernetes/kubeadm/master |