Merge b3c3b6b266 into 635f0b21b3

Since ansible-base 2.10 (later ansible-core), FQCN is the new way to go.

Updated .ansible-lint with a production profile and removed fqcn in skip_list.
Updated .yamllint with rules needed.

Ran ansible-lint --fix=all, then manually applied some minor changes.

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 
-<!-- It's a good idea to check this post first for general troubleshooting https://github.com/timothystewart6/k3s-ansible/discussions/19   -->
+<!-- It's a good idea to check this post first for general troubleshooting https://github.com/techno-tim/k3s-ansible/discussions/19   -->
 
 <!--- Provide a general summary of the issue in the Title above -->
 
@@ -82,4 +82,4 @@ node
 ## Possible Solution
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 
-- [ ] I've checked the [General Troubleshooting Guide](https://github.com/timothystewart6/k3s-ansible/discussions/20)
+- [ ] I've checked the [General Troubleshooting Guide](https://github.com/techno-tim/k3s-ansible/discussions/20)

.github/workflows/cache.yml

@@ -11,19 +11,19 @@ jobs:
 
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # 5.3.0
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # 5.1.1
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
       - name: Cache Vagrant boxes
         id: cache-vagrant
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # 4.1.2
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2
         with:
           lookup-only: true #if it exists, we don't need to restore and can skip the next step
           path: |

.github/workflows/lint.yml

@@ -11,18 +11,18 @@ jobs:
 
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # 5.3.0
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # 5.1.1
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
       - name: Restore Ansible cache
-        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # 4.1.2
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2
         with:
           path: ~/.ansible/collections
           key: ansible-${{ hashFiles('collections/requirements.yml') }}
@@ -45,9 +45,9 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
       - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@9e9574ef04ea69da568d6249bd69539ccc704e74 # 4.0.0
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@b88cd0aad2c36a63e42c71f81cb1958fed95ac87 # 3.0.10
         with:
           allowlist: |
             aws-actions/

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -59,13 +59,13 @@ jobs:
           EOF
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # 5.3.0
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # 5.1.1
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
       - name: Restore vagrant Boxes cache
-        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # 4.1.2
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2
         with:
           path: ~/.vagrant.d/boxes
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
@@ -118,7 +118,7 @@ jobs:
 
       - name: Upload log files
         if: always() # do this even if a step before has failed
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # 4.4.3
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 4.3.6
         with:
           name: logs
           path: |

README.md

@@ -117,81 +117,9 @@ Then change `server: https://127.0.0.1:6443` to match your master IP: `server: h
 
 See the commands [here](https://technotim.live/posts/k3s-etcd-ansible/#testing-your-cluster).
 
-### Variables
-
-| Role(s) | Variable | Type | Default | Required | Description |
-|---|---|---|---|---|---|
-| `download` | `k3s_version` | string | ❌ | Required | K3s binaries version |
-| `k3s_agent`, `k3s_server`, `k3s_server_post` | `apiserver_endpoint` | string | ❌ | Required | Virtual ip-address configured on each master |
-| `k3s_agent` | `extra_agent_args` | string | `null` | Not required | Extra arguments for agents nodes |
-| `k3s_agent`, `k3s_server` | `group_name_master` | string | `null` | Not required | Name othe master group |
-| `k3s_agent` | `k3s_token` | string | `null` | Not required | Token used to communicate between masters |
-| `k3s_agent`, `k3s_server` | `proxy_env` | dict | `null` | Not required | Internet proxy configurations |
-| `k3s_agent`, `k3s_server` | `proxy_env.HTTP_PROXY` | string | ❌ | Required | HTTP internet proxy |
-| `k3s_agent`, `k3s_server` | `proxy_env.HTTPS_PROXY` | string | ❌ | Required | HTTP internet proxy |
-| `k3s_agent`, `k3s_server` | `proxy_env.NO_PROXY` | string | ❌ | Required | Addresses that will not use the proxies |
-| `k3s_agent`, `k3s_server`, `reset` | `systemd_dir` | string | `/etc/systemd/system` | Not required | Path to systemd services |
-| `k3s_custom_registries` | `custom_registries_yaml` | string | ❌ | Required | YAML block defining custom registries. The following is an example that pulls all images used in this playbook through your private registries. It also allows you to pull your own images from your private registry, without having to use imagePullSecrets in your deployments. If all you need is your own images and you don't care about caching the docker/quay/ghcr.io images, you can just remove those from the mirrors: section. |
-| `k3s_server`, `k3s_server_post` | `cilium_bgp` | bool | `~` | Not required | Enable cilium BGP control plane for LB services and pod cidrs. Disables the use of MetalLB. |
-| `k3s_server`, `k3s_server_post` | `cilium_iface` | string | ❌ | Not required | The network interface used for when Cilium is enabled |
-| `k3s_server` | `extra_server_args` | string | `""` | Not required | Extra arguments for server nodes |
-| `k3s_server` | `k3s_create_kubectl_symlink` | bool | `false` | Not required | Create the kubectl -> k3s symlink |
-| `k3s_server` | `k3s_create_crictl_symlink` | bool | `true` | Not required | Create the crictl -> k3s symlink |
-| `k3s_server` | `kube_vip_arp` | bool | `true` | Not required | Enables kube-vip ARP broadcasts |
-| `k3s_server` | `kube_vip_bgp` | bool | `false` | Not required | Enables kube-vip BGP peering |
-| `k3s_server` | `kube_vip_bgp_routerid` | string | `"127.0.0.1"` | Not required | Defines the router ID for the kube-vip BGP server |
-| `k3s_server` | `kube_vip_bgp_as` | string | `"64513"` | Not required | Defines the AS for the kube-vip BGP server |
-| `k3s_server` | `kube_vip_bgp_peeraddress` | string | `"192.168.30.1"` | Not required | Defines the address for the kube-vip BGP peer |
-| `k3s_server` | `kube_vip_bgp_peeras` | string | `"64512"` | Not required | Defines the AS for the kube-vip BGP peer |
-| `k3s_server` | `kube_vip_bgp_peers` | list | `[]` | Not required | List of BGP peer ASN & address pairs |
-| `k3s_server` | `kube_vip_bgp_peers_groups` | list | `['k3s_master']` | Not required | Inventory group in which to search for additional `kube_vip_bgp_peers` parameters to merge. |
-| `k3s_server` | `kube_vip_iface` | string | `~` | Not required | Explicitly define an interface that ALL control nodes should use to propagate the VIP, define it here. Otherwise, kube-vip will determine the right interface automatically at runtime. |
-| `k3s_server` | `kube_vip_tag_version` | string | `v0.7.2` | Not required | Image tag for kube-vip |
-| `k3s_server` | `kube_vip_cloud_provider_tag_version` | string | `main` | Not required | Tag for kube-vip-cloud-provider manifest when enable |
-| `k3s_server`, `k3_server_post` | `kube_vip_lb_ip_range` | string | `~` | Not required | IP range for kube-vip load balancer |
-| `k3s_server`, `k3s_server_post` | `metal_lb_controller_tag_version` | string | `v0.14.3` | Not required | Image tag for MetalLB |
-| `k3s_server` | `metal_lb_speaker_tag_version` | string | `v0.14.3` | Not required | Image tag for MetalLB |
-| `k3s_server` | `metal_lb_type` | string | `native` | Not required | Use FRR mode or native. Valid values are `frr` and `native` |
-| `k3s_server` | `retry_count` | int | `20` | Not required | Amount of retries when verifying that nodes joined |
-| `k3s_server` | `server_init_args` | string | ❌ | Not required | Arguments for server nodes |
-| `k3s_server_post` | `bpf_lb_algorithm` | string | `maglev` | Not required | BPF lb algorithm |
-| `k3s_server_post` | `bpf_lb_mode` | string | `hybrid` | Not required | BPF lb mode |
-| `k3s_server_post` | `calico_blocksize` | int | `26` | Not required | IP pool block size |
-| `k3s_server_post` | `calico_ebpf` | bool | `false` | Not required | Use eBPF dataplane instead of iptables |
-| `k3s_server_post` | `calico_encapsulation` | string | `VXLANCrossSubnet` | Not required | IP pool encapsulation |
-| `k3s_server_post` | `calico_natOutgoing` | string | `Enabled` | Not required | IP pool NAT outgoing |
-| `k3s_server_post` | `calico_nodeSelector` | string | `all()` | Not required | IP pool node selector |
-| `k3s_server_post` | `calico_iface` | string | `~` | Not required | The network interface used for when Calico is enabled |
-| `k3s_server_post` | `calico_tag` | string | `v3.27.2` | Not required | Calico version tag |
-| `k3s_server_post` | `cilium_bgp_my_asn` | int | `64513` | Not required | Local ASN for BGP peer |
-| `k3s_server_post` | `cilium_bgp_peer_asn` | int | `64512` | Not required | BGP peer ASN |
-| `k3s_server_post` | `cilium_bgp_peer_address` | string | `~` | Not required | BGP peer address |
-| `k3s_server_post` | `cilium_bgp_neighbors` | list | `[]` | Not required | List of BGP peer ASN & address pairs |
-| `k3s_server_post` | `cilium_bgp_neighbors_groups` | list | `['k3s_all']` | Not required | Inventory group in which to search for additional `cilium_bgp_neighbors` parameters to merge. |
-| `k3s_server_post` | `cilium_bgp_lb_cidr` | string | `192.168.31.0/24` | Not required | BGP load balancer IP range |
-| `k3s_server_post` | `cilium_exportPodCIDR` | bool | `true` | Not required | Export pod CIDR |
-| `k3s_server_post` | `cilium_hubble` | bool | `true` | Not required | Enable Cilium Hubble |
-| `k3s_server_post` | `cilium_hubble` | bool | `true` | Not required | Enable Cilium Hubble |
-| `k3s_server_post` | `cilium_mode` | string | `native` | Not required | Inner-node communication mode (choices are `native` and `routed`) |
-| `k3s_server_post` | `cluster_cidr` | string | `10.52.0.0/16` | Not required | Inner-cluster IP range |
-| `k3s_server_post` | `enable_bpf_masquerade` | bool | `true` | Not required | Use IP masquerading |
-| `k3s_server_post` | `kube_proxy_replacement` | bool | `true` | Not required | Replace the native kube-proxy with Cilium |
-| `k3s_server_post` | `metal_lb_available_timeout` | string | `240s` | Not required | Wait for MetalLB resources |
-| `k3s_server_post` | `metal_lb_ip_range` | string | `192.168.30.80-192.168.30.90` | Not required | MetalLB ip range for load balancer |
-| `k3s_server_post` | `metal_lb_controller_tag_version` | string | `v0.14.3` | Not required | Image tag for MetalLB |
-| `k3s_server_post` | `metal_lb_mode` | string | `layer2` | Not required | Metallb mode (choices are `bgp` and `layer2`) |
-| `k3s_server_post` | `metal_lb_bgp_my_asn` | string | `~` | Not required | BGP ASN configurations |
-| `k3s_server_post` | `metal_lb_bgp_peer_asn` | string | `~` | Not required | BGP peer ASN configurations |
-| `k3s_server_post` | `metal_lb_bgp_peer_address` | string | `~` | Not required | BGP peer address |
-| `lxc` | `custom_reboot_command` | string | `~` | Not required | Command to run on reboot |
-| `prereq` | `system_timezone` | string | `null` | Not required | Timezone to be set on all nodes |
-| `proxmox_lxc`, `reset_proxmox_lxc` | `proxmox_lxc_ct_ids` | list | ❌ | Required | Proxmox container ID list |
-| `raspberrypi` | `state` | string | `present` | Not required | Indicates whether the k3s prerequisites for Raspberry Pi should be set up (possible values are `present` and `absent`) |
-
-
 ### Troubleshooting
 
-Be sure to see [this post](https://github.com/timothystewart6/k3s-ansible/discussions/20) on how to troubleshoot common problems
+Be sure to see [this post](https://github.com/techno-tim/k3s-ansible/discussions/20) on how to troubleshoot common problems
 
 ### Testing the playbook using molecule
 
@@ -218,7 +146,7 @@ collections:
   - name: community.general
   - name: ansible.posix
   - name: kubernetes.core
-  - name: https://github.com/timothystewart6/k3s-ansible.git
+  - name: https://github.com/techno-tim/k3s-ansible.git
     type: git
     version: master
 ```

galaxy.yml

@@ -56,16 +56,16 @@ dependencies:
   kubernetes.core: '*'
 
 # The URL of the originating SCM repository
-repository: https://github.com/timothystewart6/k3s-ansible
+repository: https://github.com/techno-tim/k3s-ansible
 
 # The URL to any online docs
-documentation: https://github.com/timothystewart6/k3s-ansible
+documentation: https://github.com/techno-tim/k3s-ansible
 
 # The URL to the homepage of the collection/project
 homepage: https://www.youtube.com/watch?v=CbkEWcUZ7zM
 
 # The URL to the collection issue tracker
-issues: https://github.com/timothystewart6/k3s-ansible/issues
+issues: https://github.com/techno-tim/k3s-ansible/issues
 
 # A list of file glob-like patterns used to filter any files or directories that should not be included in the build
 # artifact. A pattern is matched from the relative path of the file or directory of the collection directory. This

requirements.txt

@@ -6,7 +6,7 @@
 #
 ansible-compat==4.1.11
     # via molecule
-ansible-core==2.18.0
+ansible-core==2.17.2
     # via
     #   -r requirements.in
     #   ansible-compat

roles/k3s_agent/meta/main.yml

@@ -19,19 +19,14 @@ argument_specs:
 
       proxy_env:
         type: dict
-        description:
-          - Internet proxy configurations.
-          - See https://docs.k3s.io/advanced#configuring-an-http-proxy for details
+        description: Internet proxy configurations
         default: ~
         options:
           HTTP_PROXY:
-            description: HTTP internet proxy
             required: true
           HTTPS_PROXY:
-            description: HTTPS internet proxy
             required: true
           NO_PROXY:
-            description: Addresses that will not use the proxies
             required: true
 
       systemd_dir:

roles/k3s_server/defaults/main.yml

@@ -1,8 +1,6 @@
 ---
 extra_server_args: ""
 
-k3s_kubectl_binary: k3s kubectl
-
 group_name_master: master
 
 kube_vip_arp: true
@@ -16,9 +14,6 @@ kube_vip_bgp_as: "64513"
 kube_vip_bgp_peeraddress: 192.168.30.1
 kube_vip_bgp_peeras: "64512"
 
-kube_vip_bgp_peers: []
-kube_vip_bgp_peers_groups: ['k3s_master']
-
 metal_lb_controller_tag_version: v0.14.3
 metal_lb_speaker_tag_version: v0.14.3
 metal_lb_type: native

roles/k3s_server/meta/main.yml

@@ -62,14 +62,6 @@ argument_specs:
         description: Defines the AS for the kube-vip BGP peer
         default: "64512"
 
-      kube_vip_bgp_peers:
-        description: List of BGP peer ASN & address pairs
-        default: []
-
-      kube_vip_bgp_peers_groups:
-        description: Inventory group in which to search for additional kube_vip_bgp_peers parameters to merge.
-        default: ['k3s_master']
-
       kube_vip_iface:
         description:
           - Explicitly define an interface that ALL control nodes
@@ -103,23 +95,17 @@ argument_specs:
           - frr
           - native
         default: native
-        description: Use FRR mode or native. Valid values are `frr` and `native`
 
       proxy_env:
         type: dict
-        description:
-          - Internet proxy configurations.
-          - See https://docs.k3s.io/advanced#configuring-an-http-proxy for details
+        description: Internet proxy configurations
         default: ~
         options:
           HTTP_PROXY:
-            description: HTTP internet proxy
             required: true
           HTTPS_PROXY:
-            description: HTTPS internet proxy
             required: true
           NO_PROXY:
-            description: Addresses that will not use the proxies
             required: true
 
       retry_count:

roles/k3s_server/tasks/main.yml

@@ -44,7 +44,7 @@
   block:
     - name: Verify that all nodes actually joined (check k3s-init.service if this fails)
       ansible.builtin.command:
-        cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} get nodes -l 'node-role.kubernetes.io/master=true' -o=jsonpath='{.items[*].metadata.name}'" # yamllint disable-line rule:line-length
+        cmd: k3s kubectl get nodes -l "node-role.kubernetes.io/master=true" -o=jsonpath="{.items[*].metadata.name}"
       register: nodes
       until: nodes.rc == 0 and (nodes.stdout.split() | length) == (groups[group_name_master | default('master')] | length) # yamllint disable-line rule:line-length
       retries: "{{ retry_count | default(20) }}"
@@ -124,7 +124,7 @@
 
 - name: Configure kubectl cluster to {{ endpoint_url }}
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} config set-cluster default
+    k3s kubectl config set-cluster default
       --server={{ endpoint_url }}
       --kubeconfig {{ ansible_user_dir }}/.kube/config
   changed_when: true

roles/k3s_server/tasks/vip.yml

@@ -1,8 +1,4 @@
 ---
-- name: Set _kube_vip_bgp_peers fact
-  ansible.builtin.set_fact:
-    _kube_vip_bgp_peers: "{{ lookup('community.general.merge_variables', '^kube_vip_bgp_peers__.+$', initial_value=kube_vip_bgp_peers, groups=kube_vip_bgp_peers_groups) }}"  # yamllint disable-line rule:line-length
-
 - name: Create manifests directory on first master
   ansible.builtin.file:
     path: /var/lib/rancher/k3s/server/manifests

roles/k3s_server/templates/vip.yaml.j2

@@ -61,10 +61,6 @@ spec:
         - name: bgp_routerid
           value: "{{ kube_vip_bgp_routerid }}"
 {% endif %}
-{% if _kube_vip_bgp_peers | length > 0 %}
-        - name: bgppeers
-          value: "{{ _kube_vip_bgp_peers | map(attribute='peer_address') | zip(_kube_vip_bgp_peers| map(attribute='peer_asn')) | map('join', ',') | join(':') }}"  # yamllint disable-line rule:line-length
-{% else %}
 {% if kube_vip_bgp_as is defined %}
         - name: bgp_as
           value: "{{ kube_vip_bgp_as }}"
@@ -77,7 +73,6 @@ spec:
         - name: bgp_peeras
           value: "{{ kube_vip_bgp_peeras }}"
 {% endif %}
-{% endif %}
 {% endif %}
         image: ghcr.io/kube-vip/kube-vip:{{ kube_vip_tag_version }}
         imagePullPolicy: Always

roles/k3s_server_post/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-k3s_kubectl_binary: k3s kubectl
-
 bpf_lb_algorithm: maglev
 bpf_lb_mode: hybrid
 
@@ -15,8 +13,6 @@ cilium_bgp: false
 cilium_exportPodCIDR: true  # noqa var-naming
 cilium_bgp_my_asn: 64513
 cilium_bgp_peer_asn: 64512
-cilium_bgp_neighbors: []
-cilium_bgp_neighbors_groups: ['k3s_all']
 cilium_bgp_lb_cidr: 192.168.31.0/24
 cilium_hubble: true
 cilium_mode: native

roles/k3s_server_post/meta/main.yml

@@ -66,14 +66,6 @@ argument_specs:
         description: BGP peer address
         default: ~
 
-      cilium_bgp_neighbors:
-        description: List of BGP peer ASN & address pairs
-        default: []
-
-      cilium_bgp_neighbors_groups:
-        description: Inventory group in which to search for additional cilium_bgp_neighbors parameters to merge.
-        default: ['k3s_all']
-
       cilium_bgp_lb_cidr:
         description: BGP load balancer IP range
         default: 192.168.31.0/24

roles/k3s_server_post/tasks/calico.yml

@@ -31,21 +31,21 @@
       block:
         - name: Deploy Tigera Operator
           ansible.builtin.command:
-            cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} create -f /tmp/k3s/tigera-operator.yaml"
+            cmd: kubectl create -f /tmp/k3s/tigera-operator.yaml
           register: create_operator
           changed_when: "'created' in create_operator.stdout"
           failed_when: "'Error' in create_operator.stderr and 'already exists' not in create_operator.stderr"
       rescue:
         - name: Replace existing Tigera Operator
           ansible.builtin.command:
-            cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} replace -f /tmp/k3s/tigera-operator.yaml"
+            cmd: kubectl replace -f /tmp/k3s/tigera-operator.yaml
           register: replace_operator
           changed_when: "'replaced' in replace_operator.stdout"
           failed_when: "'Error' in replace_operator.stderr"
 
     - name: Wait for Tigera Operator resources
       ansible.builtin.command: >-
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} wait {{ item.type }}/{{ item.name }}
+        k3s kubectl wait {{ item.type }}/{{ item.name }}
         --namespace='tigera-operator'
         --for=condition=Available=True
         --timeout=30s
@@ -63,14 +63,14 @@
       block:
         - name: Deploy custom resources for Calico
           ansible.builtin.command:
-            cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} create -f /tmp/k3s/custom-resources.yaml"
+            cmd: kubectl create -f /tmp/k3s/custom-resources.yaml
           register: create_cr
           changed_when: "'created' in create_cr.stdout"
           failed_when: "'Error' in create_cr.stderr and 'already exists' not in create_cr.stderr"
       rescue:
         - name: Apply new Calico custom resource manifest
           ansible.builtin.command:
-            cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} apply -f /tmp/k3s/custom-resources.yaml"
+            cmd: kubectl apply -f /tmp/k3s/custom-resources.yaml
           register: apply_cr
           changed_when: "'configured' in apply_cr.stdout or 'created' in apply_cr.stdout"
           failed_when: "'Error' in apply_cr.stderr"
@@ -78,12 +78,12 @@
     - name: Wait for Calico system resources to be available
       ansible.builtin.command: >-
         {% if item.type == 'daemonset' %}
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} wait pods
+        k3s kubectl wait pods
         --namespace='{{ item.namespace }}'
         --selector={{ item.selector }}
         --for=condition=Ready
         {% else %}
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} wait {{ item.type }}/{{ item.name }}
+        k3s kubectl wait {{ item.type }}/{{ item.name }}
         --namespace='{{ item.namespace }}'
         --for=condition=Available
         {% endif %}
@@ -111,7 +111,7 @@
     - name: Patch Felix configuration for eBPF mode
       ansible.builtin.command:
         cmd: >
-          {{ k3s_kubectl_binary | default('k3s kubectl') }} patch felixconfiguration default
+          kubectl patch felixconfiguration default
           --type='merge'
           --patch='{"spec": {"bpfKubeProxyIptablesCleanupEnabled": false}}'
       register: patch_result

roles/k3s_server_post/tasks/cilium.yml

@@ -116,8 +116,7 @@
       when: ping_result.rc != 0
 
     - name: Test for existing Cilium install
-      ansible.builtin.command: |
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} -n kube-system get daemonsets cilium
+      ansible.builtin.command: k3s kubectl -n kube-system get daemonsets cilium
       register: cilium_installed
       failed_when: false
       changed_when: false
@@ -193,12 +192,12 @@
     - name: Wait for Cilium resources
       ansible.builtin.command: >-
         {% if item.type == 'daemonset' %}
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} wait pods
+        k3s kubectl wait pods
         --namespace=kube-system
         --selector='k8s-app=cilium'
         --for=condition=Ready
         {% else %}
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} wait {{ item.type }}/{{ item.name }}
+        k3s kubectl wait {{ item.type }}/{{ item.name }}
         --namespace=kube-system
         --for=condition=Available
         {% endif %}
@@ -221,10 +220,6 @@
     - name: Configure Cilium BGP
       when: cilium_bgp
       block:
-        - name: Set _cilium_bgp_neighbors fact
-          ansible.builtin.set_fact:
-            _cilium_bgp_neighbors: "{{ lookup('community.general.merge_variables', '^cilium_bgp_neighbors__.+$', initial_value=cilium_bgp_neighbors, groups=cilium_bgp_neighbors_groups) }}"  # yamllint disable-line rule:line-length
-
         - name: Copy BGP manifests to first master
           ansible.builtin.template:
             src: cilium.crs.j2
@@ -235,7 +230,7 @@
 
         - name: Apply BGP manifests
           ansible.builtin.command:
-            cmd: "{{ k3s_kubectl_binary | default('k3s kubectl') }} apply -f /tmp/k3s/cilium-bgp.yaml"
+            cmd: kubectl apply -f /tmp/k3s/cilium-bgp.yaml
           register: apply_cr
           changed_when: "'configured' in apply_cr.stdout or 'created' in apply_cr.stdout"
           failed_when: "'is invalid' in apply_cr.stderr"
@@ -249,8 +244,8 @@
         - name: Test for BGP config resources
           ansible.builtin.command: "{{ item }}"
           loop:
-            - "{{ k3s_kubectl_binary | default('k3s kubectl') }} get CiliumBGPPeeringPolicy.cilium.io"
-            - "{{ k3s_kubectl_binary | default('k3s kubectl') }} get CiliumLoadBalancerIPPool.cilium.io"
+            - k3s kubectl get CiliumBGPPeeringPolicy.cilium.io
+            - k3s kubectl get CiliumLoadBalancerIPPool.cilium.io
           changed_when: false
           loop_control:
             label: "{{ item }}"

roles/k3s_server_post/tasks/metallb.yml

@@ -12,14 +12,14 @@
   ansible.builtin.shell: |-
     set -o pipefail
 
-    REPLICAS=$({{ k3s_kubectl_binary | default('k3s kubectl') }} --namespace='metallb-system' get replicasets \
+    REPLICAS=$(k3s kubectl --namespace='metallb-system' get replicasets \
       -l 'component=controller,app=metallb' \
       -o jsonpath='{.items[0].spec.template.spec.containers[0].image}, {.items[0].metadata.name}' 2>/dev/null || true)
     REPLICAS_SETS=$(echo ${REPLICAS} | grep -v '{{ metal_lb_controller_tag_version }}' | sed -e "s/^.*\s//g")
     if [ -n "${REPLICAS_SETS}" ] ; then
       for REPLICAS in "${REPLICAS_SETS}"
       do
-        {{ k3s_kubectl_binary | default('k3s kubectl') }} --namespace='metallb-system' \
+        k3s kubectl --namespace='metallb-system' \
           delete rs "${REPLICAS}"
       done
     fi
@@ -40,14 +40,14 @@
 
 - name: Test metallb-system namespace
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} -n metallb-system
+    k3s kubectl -n metallb-system
   changed_when: false
   with_items: "{{ groups[group_name_master | default('master')] }}"
   run_once: true
 
 - name: Wait for MetalLB resources
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} wait {{ item.resource }}
+    k3s kubectl wait {{ item.resource }}
     --namespace='metallb-system'
     {% if item.name | default(False) -%}{{ item.name }}{%- endif %}
     {% if item.selector | default(False) -%}--selector='{{ item.selector }}'{%- endif %}
@@ -99,14 +99,14 @@
 
 - name: Test metallb-system webhook-service endpoint
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} -n metallb-system get endpoints {{ metallb_webhook_service_name }}
+    k3s kubectl -n metallb-system get endpoints {{ metallb_webhook_service_name }}
   changed_when: false
   with_items: "{{ groups[group_name_master | default('master')] }}"
   run_once: true
 
 - name: Apply metallb CRs
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} apply -f /tmp/k3s/metallb-crs.yaml
+    k3s kubectl apply -f /tmp/k3s/metallb-crs.yaml
     --timeout='{{ metal_lb_available_timeout }}'
   register: this
   changed_when: false
@@ -116,7 +116,7 @@
 
 - name: Test metallb-system resources for Layer 2 configuration
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} -n metallb-system get {{ item }}
+    k3s kubectl -n metallb-system get {{ item }}
   changed_when: false
   run_once: true
   when: metal_lb_mode == "layer2"
@@ -126,7 +126,7 @@
 
 - name: Test metallb-system resources for BGP configuration
   ansible.builtin.command: >-
-    {{ k3s_kubectl_binary | default('k3s kubectl') }} -n metallb-system get {{ item }}
+    k3s kubectl -n metallb-system get {{ item }}
   changed_when: false
   run_once: true
   when: metal_lb_mode == "bgp"

roles/k3s_server_post/templates/cilium.crs.j2

@@ -7,19 +7,6 @@ spec: # CiliumBGPPeeringPolicySpec
  - localASN: {{ cilium_bgp_my_asn }}
    exportPodCIDR: {{ cilium_exportPodCIDR | default('true') }}
    neighbors: # []CiliumBGPNeighbor
-{% if _cilium_bgp_neighbors | length > 0 %}
-{% for item in _cilium_bgp_neighbors %}
-    - peerAddress: '{{ item.peer_address + "/32"}}'
-      peerASN: {{ item.peer_asn }}
-      eBGPMultihopTTL: 10
-      connectRetryTimeSeconds: 120
-      holdTimeSeconds: 90
-      keepAliveTimeSeconds: 30
-      gracefulRestart:
-        enabled: true
-        restartTimeSeconds: 120
-{% endfor %}
-{% else %}
     - peerAddress: '{{ cilium_bgp_peer_address + "/32"}}'
       peerASN: {{ cilium_bgp_peer_asn }}
       eBGPMultihopTTL: 10
@@ -29,7 +16,6 @@ spec: # CiliumBGPPeeringPolicySpec
       gracefulRestart:
         enabled: true
         restartTimeSeconds: 120
-{% endif %}
    serviceSelector:
       matchExpressions:
          - {key: somekey, operator: NotIn, values: ['never-used-value']}

roles/lxc/meta/main.yml

@@ -5,4 +5,3 @@ argument_specs:
     options:
       custom_reboot_command:
         default: ~
-        description: Command to run on reboot

roles/proxmox_lxc/meta/main.yml

@@ -1,9 +0,0 @@
----
-argument_specs:
-  main:
-    short_description: Proxmox LXC settings
-    options:
-      proxmox_lxc_ct_ids:
-        description: Proxmox container ID list
-        type: list
-        required: true

roles/raspberrypi/meta/main.yml

@@ -1,10 +0,0 @@
----
-argument_specs:
-  main:
-    short_description: Adjust some Raspberry Pi specific requisites
-    options:
-      state:
-        default: present
-        description:
-          - Indicates whether the k3s prerequisites for Raspberry Pi should be
-          - set up (possible values are `present` and `absent`)

roles/raspberrypi/tasks/setup/Ubuntu.yml

@@ -11,4 +11,3 @@
   ansible.builtin.apt:
     name: linux-modules-extra-raspi
     state: present
-  when: ansible_distribution_version is version('24.04', '<')

roles/raspberrypi/tasks/teardown/Ubuntu.yml

@@ -3,4 +3,3 @@
   ansible.builtin.apt:
     name: linux-modules-extra-raspi
     state: absent
-  when: ansible_distribution_version is version('24.04', '<')

roles/reset_proxmox_lxc/meta/main.yml

@@ -1,9 +0,0 @@
----
-argument_specs:
-  main:
-    short_description: Proxmox LXC settings
-    options:
-      proxmox_lxc_ct_ids:
-        description: Proxmox container ID list
-        type: list
-        required: true