Upstream/k3s-ansible
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s-ansible.git synced 2024-10-29 07:49:37 +01:00
Code Issues Projects Releases Wiki Activity

Don't modify existing airgap k3s-install script (#372)

Browse Source 
* Check for existing k3s install script during airgap deployment

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Update vagrant file to newer OS

Signed-off-by: Derek Nola <derek.nola@suse.com>

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola 2024-10-18 09:33:01 -07:00 committed by GitHub
parent 99fa632acb
commit c82a2f9b8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Vagrantfile vendored
View File

@ -1,6 +1,6 @@
# ENV['VAGRANT_NO_PARALLEL'] = 'no' # ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES = ["server-0", "server-1", "server-2", "agent-0", "agent-1"] 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_CPUS = 2
NODE_MEMORY = 2048 NODE_MEMORY = 2048
# Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks # 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"], "k3s_cluster:children" => ["server", "agent"],
} }
ansible.extra_vars = { ansible.extra_vars = {
k3s_version: "v1.26.9+k3s1", k3s_version: "v1.28.14+k3s1",
api_endpoint: "#{NETWORK_PREFIX}.100", api_endpoint: "#{NETWORK_PREFIX}.100",
token: "myvagrant", token: "myvagrant",
# Required to use the private network configured above # Required to use the private network configured above
extra_server_args: "--node-external-ip #{node_ip} --flannel-iface eth1", extra_server_args: "--node-external-ip #{node_ip} --flannel-iface eth1",
extra_agent_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 # Optional, left as reference for ruby-ansible syntax
# extra_service_envs: [ "NO_PROXY='localhost'" ], # extra_service_envs: [ "NO_PROXY='localhost'" ],
# server_config_yaml: <<~YAML # server_config_yaml: <<~YAML

9
roles/airgap/tasks/main.yml
View File

@ -8,9 +8,18 @@
that: "ansible_version.full is version_compare('2.12', '>=')" that: "ansible_version.full is version_compare('2.12', '>=')"
msg: "The Airgap role requires at least ansible-core 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 - name: Download k3s install script
become: false become: false
delegate_to: localhost delegate_to: localhost
# Workaround for https://github.com/ansible/ansible/issues/64016
when: not host_install_script.stat.exists
ansible.builtin.get_url: ansible.builtin.get_url:
url: https://get.k3s.io/ url: https://get.k3s.io/
timeout: 120 timeout: 120