summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/kubernetes-prepare.yml45
-rw-r--r--common/kubernetes.yml43
-rw-r--r--inventory/group_vars/k8s-test/main.yml3
-rw-r--r--spreadspace/k8s-test.yml19
4 files changed, 57 insertions, 53 deletions
diff --git a/common/kubernetes-prepare.yml b/common/kubernetes-prepare.yml
new file mode 100644
index 00000000..c91d1962
--- /dev/null
+++ b/common/kubernetes-prepare.yml
@@ -0,0 +1,45 @@
+---
+- name: create host groups
+ hosts: "{{ kubernetes_nodes_group }}"
+ connection: local
+ gather_facts: no
+ run_once: yes
+ tasks:
+ - name: sanity check - fail if masters are not included in nodes
+ assert:
+ msg: "the cluster node group '{{ kubernetes_nodes_group }}' must include *all* nodes (master and non-master)"
+ that: kubernetes_masters | difference(ansible_play_hosts_all) | length == 0
+
+ - name: sanity check - fail if primary master is not in masters
+ when: kubernetes_primary_master is defined
+ assert:
+ msg: "kubernetes_masters must include kubernetes_primary_master"
+ that: kubernetes_primary_master in kubernetes_masters
+
+ - 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_primary_master"
+ that: (kubernetes_masters | length) == 1 or kubernetes_primary_master is defined
+
+ - name: create group for all kubernetes nodes
+ loop: "{{ ansible_play_hosts_all }}"
+ add_host:
+ name: "{{ item }}"
+ inventory_dir: "{{ hostvars[kubernetes_masters[0]].inventory_dir }}"
+ group: _kubernetes_nodes_
+ changed_when: False
+
+ - name: create group for kubernetes master nodes
+ loop: "{{ kubernetes_masters }}"
+ add_host:
+ name: "{{ item }}"
+ inventory_dir: "{{ hostvars[kubernetes_masters[0]].inventory_dir }}"
+ group: _kubernetes_masters_
+ changed_when: False
+
+ - name: create group for kubernetes primary master
+ add_host:
+ name: "{{ kubernetes_primary_master | default(kubernetes_masters[0]) }}"
+ inventory_dir: "{{ hostvars[kubernetes_masters[0]].inventory_dir }}"
+ group: _kubernetes_primary_master_
+ changed_when: False
diff --git a/common/kubernetes.yml b/common/kubernetes.yml
index d1b4592a..adcaf5e7 100644
--- a/common/kubernetes.yml
+++ b/common/kubernetes.yml
@@ -1,46 +1,5 @@
---
-- name: create host groups
- hosts: localhost
- gather_facts: no
- tasks:
- - name: sanity check - fail if masters are not included in nodes
- assert:
- msg: "kubernetes_cluster_layout.nodes must include all nodes (master and non-master)"
- that: kubernetes_cluster_layout.masters | difference(kubernetes_cluster_layout.nodes) | length == 0
-
- - name: sanity check - fail if primary master is not in masters
- when: kubernetes_cluster_layout.primary_master is defined
- assert:
- msg: "kubernetes_cluster_layout.masters must include kubernetes_cluster_layout.primary_master"
- that: kubernetes_cluster_layout.primary_master in kubernetes_cluster_layout.masters
-
- - 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"
- that: (kubernetes_cluster_layout.masters | length) == 1 or kubernetes_cluster_layout.primary_master is defined
-
- - name: create group for all kubernetes nodes
- loop: "{{ kubernetes_cluster_layout.nodes }}"
- add_host:
- name: "{{ item }}"
- inventory_dir: "{{ hostvars[kubernetes_cluster_layout.masters[0]].inventory_dir }}"
- group: _kubernetes_nodes_
- changed_when: False
-
- - name: create group for kubernetes master nodes
- loop: "{{ kubernetes_cluster_layout.masters }}"
- add_host:
- name: "{{ item }}"
- inventory_dir: "{{ hostvars[kubernetes_cluster_layout.masters[0]].inventory_dir }}"
- group: _kubernetes_masters_
- changed_when: False
-
- - name: create group for kubernetes primary master
- add_host:
- name: "{{ kubernetes_cluster_layout.primary_master | default(kubernetes_cluster_layout.masters[0]) }}"
- inventory_dir: "{{ hostvars[kubernetes_cluster_layout.masters[0]].inventory_dir }}"
- group: _kubernetes_primary_master_
- changed_when: False
+- import_playbook: kubernetes-prepare.yml
- name: prepare variables and do some sanity checks
hosts: _kubernetes_nodes_
diff --git a/inventory/group_vars/k8s-test/main.yml b/inventory/group_vars/k8s-test/main.yml
index 91b7b0c2..a4aeff04 100644
--- a/inventory/group_vars/k8s-test/main.yml
+++ b/inventory/group_vars/k8s-test/main.yml
@@ -3,6 +3,9 @@ kubernetes_version: 1.16.4
kubernetes_container_runtime: containerd
kubernetes_network_plugin: kubeguard
+kubernetes_masters:
+ - s2-k8s-test0
+
kubernetes:
cluster_name: k8s-test
diff --git a/spreadspace/k8s-test.yml b/spreadspace/k8s-test.yml
index 50f4ccac..83f19ced 100644
--- a/spreadspace/k8s-test.yml
+++ b/spreadspace/k8s-test.yml
@@ -1,14 +1,11 @@
---
-- name: cluster layout
- hosts: localhost
- gather_facts: no
- run_once: yes
- tasks:
- - name: configure cluster layout
- set_fact:
- kubernetes_cluster_layout:
- nodes: "{{ groups['k8s-test'] }}"
- masters:
- - s2-k8s-test0
+- name: Basic Node Setup
+ hosts: k8s-test
+ roles:
+ - role: base
+ - role: sshd
+ - role: zsh
- import_playbook: ../common/kubernetes.yml
+ vars:
+ kubernetes_nodes_group: k8s-test