diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 6b6d93cc..9d530b7d 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,14 +1,14 @@ -k3s_version: v1.22.2+k3s1 +k3s_version: v1.30.6+k3s1 ansible_user: root systemd_dir: /etc/systemd/system master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}" extra_server_args: "--write-kubeconfig-mode=644" extra_agent_args: "" copy_kubeconfig: true -metallb: false -metallb_version: "v0.12.1" -metallb_range: "192.168.3.93-192.168.3.94" +metallb: true +metallb_version: "v0.14.8" +metallb_range: "192.168.0.110-192.168.0.112" argocd: false argocd_service_type: LoadBalancer dns_servers: [] -ansible_python_interpreter: /usr/bin/python3 \ No newline at end of file +ansible_python_interpreter: /usr/bin/python3 diff --git a/inventory/my-cluster/group_vars/all.yml b/inventory/my-cluster/group_vars/all.yml index 6b6d93cc..9d530b7d 100755 --- a/inventory/my-cluster/group_vars/all.yml +++ b/inventory/my-cluster/group_vars/all.yml @@ -1,14 +1,14 @@ -k3s_version: v1.22.2+k3s1 +k3s_version: v1.30.6+k3s1 ansible_user: root systemd_dir: /etc/systemd/system master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}" extra_server_args: "--write-kubeconfig-mode=644" extra_agent_args: "" copy_kubeconfig: true -metallb: false -metallb_version: "v0.12.1" -metallb_range: "192.168.3.93-192.168.3.94" +metallb: true +metallb_version: "v0.14.8" +metallb_range: "192.168.0.110-192.168.0.112" argocd: false argocd_service_type: LoadBalancer dns_servers: [] -ansible_python_interpreter: /usr/bin/python3 \ No newline at end of file +ansible_python_interpreter: /usr/bin/python3 diff --git a/inventory/my-cluster/hosts.ini b/inventory/my-cluster/hosts.ini index 0eb148db..0190ea24 100755 --- a/inventory/my-cluster/hosts.ini +++ b/inventory/my-cluster/hosts.ini @@ -1,13 +1,11 @@ [master] -192.168.0.109 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa ansible_python_interpreter=/usr/bin/python3.12 +192.168.0.109 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa [node] -192.168.0.110 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa ansible_python_interpreter=/usr/bin/python3.12 -192.168.0.111 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa ansible_python_interpreter=/usr/bin/python3.12 +192.168.0.110 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa +192.168.0.111 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa +192.168.0.112 ansible_ssh_private_key_file=/root/homelab-k3s/Terraform/key/id_rsa [k3s_cluster:children] master -node - -[all:vars] -ansible_python_interpreter = /usr/local/bin/python3.12 +node \ No newline at end of file diff --git a/roles/postconfig/localhost/tasks/main.yml b/roles/postconfig/localhost/tasks/main.yml index d09d7a90..2b069cf0 100644 --- a/roles/postconfig/localhost/tasks/main.yml +++ b/roles/postconfig/localhost/tasks/main.yml @@ -36,8 +36,7 @@ - name: Install metallb shell: | - kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/{{ metallb_version }}/manifests/namespace.yaml - kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/{{ metallb_version }}/manifests/metallb.yaml + kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/{{ metallb_version }}/config/manifests/metallb-native.yaml when: metallb - name: configure metallb range diff --git a/snippets/cloud_init_worker_2.yml b/snippets/cloud_init_worker_2.yml new file mode 100755 index 00000000..2587250f --- /dev/null +++ b/snippets/cloud_init_worker_2.yml @@ -0,0 +1,10 @@ +#cloud-config +hostname: k3s-worker-2 +users: + - name: root + ssh-authorized-keys: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDItH73+vTvxxgMlv8vzpRt59KeKykYGhMhOCt+uWxbsuhjPvXRQC6dCwuDLy8heiYFO8bklOiLxLtz3GBOtp4OcjVRkgS7L4+qUn8QkAaJPQeEUuKADrCpxxLz0rYsgLo9WvQ9HS/WS15wmMHbSufGjXjhApZ3VODMyrtdaDOoyKm+YMahxY577TkX3yIdv3+yENPhP+rNdcWxFKYvEzOz2XACvq81fxfcYLN5opPbz+UILnQSyxI+TxZtzq3icPQAsVXPmZGBbryiSk3e5tFhE7ORkw1I2QG4CBEPZx+gAhbO0p3sCcdpLF7z4HxaGzJKpy6V8JxZHmLJCgQeSsgaeP3OvTU/lgsWw6xphEpQqJmb9dMjtJMyV8I/PxrLPP9ikh5tcqlXENLXSc6V4BkI1NUJZhYm0sYPcWW2ZeYy6gGzYiSgu3wqzqf0yG9j8NnMtdyvBLMhNKasqfd0CRK+CQ3apMghC68X7JK7CDA/edjfl2MA/QJ2ZoYBBzyXd9vUJgMlyZaxXG9NIA7rU88OZTmS+43y1BRNlkXh231EjtH7h25n+nYxYInFtFWbbi1liORxVO622Y4YnCdTJFoyiFGsuzSaDYfjRMzSHOjnUlUVsqYHPIfH6h/ZH5vVrAMihnIhqJDbi1rLtZVx0GsmpXMAWAee2oi4rEcEynydMQ== gba404@gmail.com + lock_passwd: false + passwd: $1$/bB7Q1vR$Nz4PtA52uDdF6.pc.haec/ +package_update: true +package_upgrade: true