README.md

@@ -1,3 +1 @@
 # Ansible
-
-Here you'll find Ansible playbooks and roles for the JILITS infrastructure 😎

playbooks/kubernetes/README.md

@@ -1,3 +0,0 @@
-# Kubernetes playbook
-
-This is a work-in-progress and currently only works with Vagrant, as the setup is being tested there for the moment before moving onto the real hardware.

playbooks/kubernetes/Vagrantfile

@@ -1,6 +1,6 @@
 IMAGE_NAME = "bento/ubuntu-22.04"
-CONTROL_PLANES = 1
-NODES = 0
+CONTROLPLANE_IP = "192.168.56.11"
+NODES = 1
 
 Vagrant.configure("2") do |config|
     config.ssh.insert_key = false
@@ -10,21 +10,19 @@ Vagrant.configure("2") do |config|
         v.cpus = 2
     end
 
-    (1..CONTROL_PLANES).each do |i|
-        config.vm.define "control-plane-#{i}" do |control_plane|
-            control_plane.vm.box = IMAGE_NAME
-            control_plane.vm.network "private_network", ip: "192.168.56.#{10 + i}"
-            control_plane.vm.hostname = "control-plane-#{i}"
-            control_plane.vm.provision "ansible" do |ansible|
+    config.vm.define "controlplane" do |master|
+        master.vm.box = IMAGE_NAME
+        master.vm.network "private_network", ip: CONTROLPLANE_IP
+        master.vm.hostname = "controlplane"
+        master.vm.provision "ansible" do |ansible|
             ansible.playbook = "playbook.yaml"
             ansible.extra_vars = {
                 cluster_name: "gerar",
-                    node_ip: "192.168.56.#{10 + i}",
-                    is_control_plane: true,
+                node_ip: CONTROLPLANE_IP,
+                is_controlplane: true,
             }
         end
     end
-    end
 
     (1..NODES).each do |i|
         config.vm.define "node-#{i}" do |node|
@@ -36,8 +34,8 @@ Vagrant.configure("2") do |config|
                 ansible.extra_vars = {
                     cluster_name: "gerar",
                     node_ip: "192.168.56.#{20 + i}",
-                    is_control_plane: false,
-                    control_plane_endpoint: "192.168.56.11",
+                    controlplane_ip: CONTROLPLANE_IP,
+                    is_controlplane: false,
                 }
             end
         end

playbooks/kubernetes/group_vars/all.yml

@@ -0,0 +1,3 @@
+pod_network_cidr: "10.254.0.0/16"
+service_cidr: "10.255.0.0/16"
+kubeadmin_config: /etc/kubernetes/admin.conf

playbooks/kubernetes/inventory.yaml

@@ -1,26 +1,2 @@
-all:
-  children:
-    gerar:
-      hosts:
-        matthew.gerar.jilits.se:
-        mark.gerar.jilits.se:
-        luke.gerar.jilits.se:
-      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"
-    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:
-    kubeadmin_config: /etc/kubernetes/admin.conf
+gerar:
+  hosts: []

playbooks/kubernetes/playbook.yaml

@@ -7,13 +7,13 @@
     - include_role:
       name: kubernetes/any
     - include_role:
-      name: kubernetes/control_plane
-      when: is_control_plane
+      name: kubernetes/controlplane
+      when: is_controlplane
     - include_role:
       name: kubernetes/node
-      when: not is_control_plane
+      when: not is_controlplane
 
-# - hosts: control_plane
+# - hosts: controlplane
 #   gather_facts: yes
 #   become: yes
 #   tasks:

roles/kubernetes/any/tasks/main.yml

@@ -84,7 +84,8 @@
 - name: Setup CRI-O
   become: true
   vars:
-    os: xUbuntu_{{ ansible_distribution_version}}
+    os: xUbuntu_22.04 # fetch this from os-release
+    version: 1.24
     key_dir: /usr/share/keyrings
     keys:
       {
@@ -95,13 +96,13 @@
           },
         "libcontainers-crio":
           {
-            "url": "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ k8s_version }}/{{ os }}/Release.key",
+            "url": "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ version }}/{{ os }}/Release.key",
             "name": "libcontainers-crio-archive-keyring",
           },
       }
     repos:
       - deb [signed-by={{ key_dir }}/libcontainers-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/{{ os }}/ /
-      - deb [signed-by={{ key_dir }}/libcontainers-crio-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ k8s_version }}/{{ os }}/ /
+      - deb [signed-by={{ key_dir }}/libcontainers-crio-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ version }}/{{ os }}/ /
   block:
     - name: Download signing keys
       with_dict: "{{ keys }}"

roles/kubernetes/node/tasks/main.yml

@@ -7,15 +7,15 @@
         path: /etc/hosts
         state: present
         regexp: '^\d+\.\d+\.\d+\.\d+\ .*-cluster-endpoint$'
-        line: "{{ control_plane_endpoint }} {{ cluster_name }}-cluster-endpoint"
+        line: "{{ controlplane_ip }} {{ cluster_name }}-cluster-endpoint"
 
-    - name: Obtain join command from control_plane
+    - name: Obtain join command from controlplane
       ansible.builtin.command: "kubeadm token create --print-join-command"
-      when: inventory_hostname != "control_plane"
+      when: inventory_hostname != "controlplane"
       register: join_cmd
       delegate_to: "{{ item }}"
       delegate_facts: true
-      with_items: ["control_plane"]
+      with_items: ["controlplane"]
 
     - name: Execute join command
       become: true