From c9061952e9d621e0015aed13db22690991db20c0 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 17 Oct 2024 10:10:08 -0700 Subject: [PATCH 1/2] Check for existing k3s install script during airgap deployment Signed-off-by: Derek Nola --- roles/airgap/tasks/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/airgap/tasks/main.yml b/roles/airgap/tasks/main.yml index 928d8f0b..092335f9 100644 --- a/roles/airgap/tasks/main.yml +++ b/roles/airgap/tasks/main.yml @@ -8,9 +8,18 @@ that: "ansible_version.full is version_compare('2.12', '>=')" msg: "The Airgap role requires at least ansible-core 2.12" + - name: Check for existing install script + become: false + delegate_to: localhost + ansible.builtin.stat: + path: "{{ airgap_dir + '/k3s-install.sh' }}" + register: host_install_script + - name: Download k3s install script become: false delegate_to: localhost + # Workaround for https://github.com/ansible/ansible/issues/64016 + when: not host_install_script.stat.exists ansible.builtin.get_url: url: https://get.k3s.io/ timeout: 120 From 41fb89d395370bf2ceef310355ed6716bdfe0290 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 17 Oct 2024 10:10:38 -0700 Subject: [PATCH 2/2] Update vagrant file to newer OS Signed-off-by: Derek Nola --- Vagrantfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 2df9ba22..c26c6270 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,6 @@ # ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = ["server-0", "server-1", "server-2", "agent-0", "agent-1"] -NODE_BOXES = ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004'] +NODE_BOXES = ['bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04'] NODE_CPUS = 2 NODE_MEMORY = 2048 # Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks @@ -26,12 +26,14 @@ def provision(vm, role, node_num) "k3s_cluster:children" => ["server", "agent"], } ansible.extra_vars = { - k3s_version: "v1.26.9+k3s1", + k3s_version: "v1.28.14+k3s1", api_endpoint: "#{NETWORK_PREFIX}.100", token: "myvagrant", # Required to use the private network configured above extra_server_args: "--node-external-ip #{node_ip} --flannel-iface eth1", extra_agent_args: "--node-external-ip #{node_ip} --flannel-iface eth1", + # Airgap setup, left as reference + # airgap_dir: "./my_airgap", # Optional, left as reference for ruby-ansible syntax # extra_service_envs: [ "NO_PROXY='localhost'" ], # server_config_yaml: <<~YAML