diff --git a/playbooks/kubernetes/Vagrantfile b/playbooks/kubernetes/Vagrantfile index 22b5ab6..bb71f7f 100644 --- a/playbooks/kubernetes/Vagrantfile +++ b/playbooks/kubernetes/Vagrantfile @@ -1,7 +1,21 @@ IMAGE_NAME = "bento/ubuntu-22.04" + CONTROL_PLANES = 1 NODES = 0 +ansible_groups = { + "control_planes" => [ + "control-plane-[1:#{CONTROL_PLANES}]" + ], + "nodes" => [ + "node-[1:#{NODES}]" + ], + "local_dev" => [ + "control-plane-[1:#{CONTROL_PLANES}]", + "node-[1:#{NODES}]" + ], +} + Vagrant.configure("2") do |config| config.ssh.insert_key = false @@ -17,10 +31,9 @@ Vagrant.configure("2") do |config| control_plane.vm.hostname = "control-plane-#{i}" control_plane.vm.provision "ansible" do |ansible| ansible.playbook = "playbook.yaml" + ansible.groups = ansible_groups ansible.extra_vars = { - cluster_name: "gerar", - node_ip: "192.168.56.#{10 + i}", - is_control_plane: true, + node_ip: "192.168.56.#{10 + i}" } end end @@ -33,10 +46,9 @@ Vagrant.configure("2") do |config| node.vm.hostname = "node-#{i}" node.vm.provision "ansible" do |ansible| ansible.playbook = "playbook.yaml" + ansible.groups = ansible_groups ansible.extra_vars = { - cluster_name: "gerar", node_ip: "192.168.56.#{20 + i}", - is_control_plane: false, control_plane_endpoint: "192.168.56.11", } end diff --git a/playbooks/kubernetes/group_vars/all.yaml b/playbooks/kubernetes/group_vars/all.yaml new file mode 100644 index 0000000..7705c67 --- /dev/null +++ b/playbooks/kubernetes/group_vars/all.yaml @@ -0,0 +1 @@ +kubeadmin_config: "/etc/kubernetes/admin.conf" diff --git a/playbooks/kubernetes/group_vars/control_planes.yaml b/playbooks/kubernetes/group_vars/control_planes.yaml new file mode 100644 index 0000000..060d4c2 --- /dev/null +++ b/playbooks/kubernetes/group_vars/control_planes.yaml @@ -0,0 +1 @@ +is_control_plane: true diff --git a/playbooks/kubernetes/group_vars/gerar.yaml b/playbooks/kubernetes/group_vars/gerar.yaml new file mode 100644 index 0000000..806f5a8 --- /dev/null +++ b/playbooks/kubernetes/group_vars/gerar.yaml @@ -0,0 +1,5 @@ +ansible_user: servant +cluster_name: "gerar" +k8s_version: "1.26" +pod_network_cidr: "10.254.0.0/16" +service_cidr: "10.255.0.0/16" diff --git a/playbooks/kubernetes/group_vars/local_dev.yaml b/playbooks/kubernetes/group_vars/local_dev.yaml new file mode 100644 index 0000000..2e3bf1a --- /dev/null +++ b/playbooks/kubernetes/group_vars/local_dev.yaml @@ -0,0 +1,5 @@ +cluster_name: "local-dev" +k8s_version: "1.26" +pod_network_cidr: "10.254.0.0/16" +service_cidr: "10.255.0.0/16" +kubeadmin_config: "/etc/kubernetes/admin.conf" diff --git a/playbooks/kubernetes/group_vars/nodes.yaml b/playbooks/kubernetes/group_vars/nodes.yaml new file mode 100644 index 0000000..a6fd843 --- /dev/null +++ b/playbooks/kubernetes/group_vars/nodes.yaml @@ -0,0 +1 @@ +is_control_plane: false diff --git a/playbooks/kubernetes/inventory.yaml b/playbooks/kubernetes/inventory.yaml index f2449ba..1bae598 100644 --- a/playbooks/kubernetes/inventory.yaml +++ b/playbooks/kubernetes/inventory.yaml @@ -5,19 +5,7 @@ all: control_planes: hosts: matthew.gerar.jilits.se: - vars: - is_control_plane: true nodes: hosts: mark.gerar.jilits.se: luke.gerar.jilits.se: - vars: - is_control_plane: false - vars: - ansible_user: servant - cluster_name: "gerar" - k8s_version: 1.26 - pod_network_cidr: "10.254.0.0/16" - service_cidr: "10.255.0.0/16" - vars: - kubeadmin_config: /etc/kubernetes/admin.conf