fix(ci): pin + cache

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,5 +11,5 @@
 - [ ] Ran `site.yml` playbook
 - [ ] Ran `reset.yml` playbook
 - [ ] Did not add any unnecessary changes
-- [ ] Ran pre-commit install at least once before committing
 - [ ] 🚀
+- [ ] Ran pre-commit install at least once before committing

.github/download-boxes.sh

@@ -5,10 +5,15 @@
 # already present on the system.
 
 set -euo pipefail
-
+YQ_VERSION=v4.29.2
+YQ_BINARY=yq_linux_amd64
 GIT_ROOT=$(git rev-parse --show-toplevel)
 PROVIDER=virtualbox
 
+# get yq used for filtering
+sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq &&\
+    sudo chmod +x /usr/bin/yq
+
 # Read all boxes for all platforms from the "molecule.yml" files
 all_boxes=$(cat "${GIT_ROOT}"/molecule/*/molecule.yml |
     yq -r '.platforms[].box' |         # Read the "box" property of each node under "platforms"

.github/workflows/ci.yml

@@ -1,15 +0,0 @@
----
-name: "CI"
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**/README.md'
-jobs:
-  lint:
-    uses: ./.github/workflows/lint.yml
-  test:
-    uses: ./.github/workflows/test.yml
-    needs: [lint]

.github/workflows/lint.yml

@@ -1,11 +1,16 @@
 ---
 name: Linting
 on:
-  workflow_call:
+  pull_request:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**/README.md'
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       PYTHON_VERSION: "3.10"
 

.github/workflows/test.yml

@@ -1,11 +1,17 @@
 ---
 name: Test
 on:
-  workflow_call:
+  pull_request:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**/README.md'
 jobs:
   molecule:
     name: Molecule
-    runs-on: macos-12
+    runs-on: self-hosted
+
     strategy:
       matrix:
         scenario:
@@ -15,6 +21,7 @@ jobs:
       fail-fast: false
     env:
       PYTHON_VERSION: "3.10"
+      VAGRANT_DEFAULT_PROVIDER: virtualbox
 
     steps:
       - name: Check out the codebase
@@ -22,6 +29,32 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Install Virtual Box from Oracle
+        run: |
+          echo "::group::Virtual Box"
+          wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | sudo gpg --dearmor --yes --output /usr/share/keyrings/oracle-virtualbox-2016.gpg
+          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee -a /etc/apt/sources.list.d/virtualbox.list
+          sudo apt update && sudo apt install -y linux-headers-generic linux-headers-5.15.0-52-generic build-essential dkms virtualbox-dkms virtualbox-6.1
+          echo "::endgroup::"
+          echo "::group::Virtual Box Test"
+          vboxmanage --version
+          sudo /sbin/vboxconfig
+          sudo modprobe vboxdrv
+          vboxmanage --version
+          echo "::endgroup::"
+
+      - name: Install Vagrant
+        run: |
+          echo "::group::Install Vagrant"
+          wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+          sudo apt update && sudo apt install -y vagrant
+          vagrant version
+          vagrant plugin list
+          vagrant plugin install vagrant-vbguest
+          vagrant plugin list
+          echo "::endgroup::"
+
       - name: Configure VirtualBox
         run: |-
           sudo mkdir -p /etc/vbox

.gitignore

@@ -1,2 +1 @@
 .env/
-*.log

.pre-commit-config.yaml

@@ -1,35 +1,21 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 3298ddab3c13dd77d6ce1fc0baf97691430d84b0  # v4.3.0
+    rev: v4.3.0
     hooks:
       - id: requirements-txt-fixer
       - id: sort-simple-yaml
       - id: detect-private-key
-      - id: check-merge-conflict
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-      - id: trailing-whitespace
-        args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: 9cce2940414e9560ae4c8518ddaee2ac1863a4d2  # v1.28.0
+    rev: v1.28.0
     hooks:
       - id: yamllint
         args: [-c=.yamllint]
   - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: a058554b9bcf88f12ad09ab9fb93b267a214368f  # v6.8.6
+    rev: v6.8.2
     hooks:
       - id: ansible-lint
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: 4c7c3dd7161ef39e984cb295e93a968236dc8e8a  # v0.8.0.4
+    rev: v0.8.0.4
     hooks:
       - id: shellcheck
-  - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: 04618e68aa2380828a36a23ff5f65a06ae8f59b9  # v1.3.1
-    hooks:
-      - id: remove-crlf
-      - id: remove-tabs
-  - repo: https://github.com/sirosen/texthooks
-    rev: 30d9af95631de0d7cff4e282bde9160d38bb0359  # 0.4.0
-    hooks:
-      - id: fix-smartquotes

LICENSE

@@ -174,4 +174,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS

README.md

@@ -10,7 +10,7 @@ If you want more context on how this works, see:
 
 📄 [Documentation](https://docs.technotim.live/posts/k3s-etcd-ansible/) (including example commands)
 
-📺 [Watch the Video](https://www.youtube.com/watch?v=CbkEWcUZ7zM)
+📺 [Video](https://www.youtube.com/watch?v=CbkEWcUZ7zM)
 
 ## 📖 k3s Ansible Playbook
 
@@ -30,12 +30,12 @@ on processor architecture:
 
 - Deployment environment must have Ansible 2.4.0+.  If you need a quick primer on Ansible [you can check out my docs and setting up Ansible](https://docs.technotim.live/posts/ansible-automation/).
 
-- You will also need to install collections that this playbook uses by running `ansible-galaxy collection install -r ./collections/requirements.yml` (important❗)
-
 - [`netaddr` package](https://pypi.org/project/netaddr/) must be available to Ansible. If you have installed Ansible via apt, this is already taken care of. If you have installed Ansible via `pip`, make sure to install `netaddr` into the respective virtual environment.
 
 - `server` and `agent` nodes should have passwordless SSH access, if not you can supply arguments to provide credentials `--ask-pass --ask-become-pass` to each command.
 
+- You will also need to install collections that this playbook uses by running `ansible-galaxy collection install -r ./collections/requirements.yml`
+
 ## 🚀 Getting Started
 
 ### 🍴 Preparation
@@ -112,13 +112,9 @@ It is run automatically in CI, but you can also run the tests locally.
 This might be helpful for quick feedback in a few cases.
 You can find more information about it [here](molecule/README.md).
 
-### Pre-commit Hooks
-
-This repo uses `pre-commit` and `pre-commit-hooks` to lint and fix common style and syntax errors.  Be sure to install python packages and then run `pre-commit install`.  For more information, see [pre-commit](https://pre-commit.com/)
-
 ## Thanks 🤝
 
-This repo is really standing on the shoulders of giants. Thank you to all those who have contributed and thanks to these repos for code and ideas:
+This repo is really standing on the shoulders of giants. Thank you to all those who have contributed and tanks to these repos for code and ideas:
 
 - [k3s-io/k3s-ansible](https://github.com/k3s-io/k3s-ansible)
 - [geerlingguy/turing-pi-cluster](https://github.com/geerlingguy/turing-pi-cluster)

ansible.cfg

@@ -1,23 +1,12 @@
 [defaults]
-nocows                  = True
+nocows = True
-roles_path              = ./roles
+roles_path = ./roles
-inventory               = ./hosts.ini
+inventory  = ./hosts.ini
-stdout_callback         = yaml
 
-remote_tmp              = $HOME/.ansible/tmp
+remote_tmp = $HOME/.ansible/tmp
-local_tmp               = $HOME/.ansible/tmp
+local_tmp  = $HOME/.ansible/tmp
-timeout                 = 60
+pipelining = True
-host_key_checking       = False
+become = True
-deprecation_warnings    = False
+host_key_checking = False
-callback_whitelist      = profile_tasks
+deprecation_warnings = False
-log_path                = ./ansible.log
+callback_whitelist = profile_tasks
-
-[privilege_escalation]
-become                  = True
-
-[ssh_connection]
-scp_if_ssh              = smart
-retries                 = 3
-ssh_args                = -o ControlMaster=auto -o ControlPersist=30m -o Compression=yes -o ServerAliveInterval=15s
-pipelining              = True
-control_path            = %(directory)s/%%h-%%r

deploy.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ansible-playbook site.yml -i inventory/my-cluster/hosts.ini
+ansible-playbook site.yml -i inventory/my-cluster/hosts.ini

inventory/sample/group_vars/all.yml

@@ -1,5 +1,5 @@
 ---
-k3s_version: v1.24.7+k3s1
+k3s_version: v1.24.6+k3s1
 # this is the user that has ssh access to these machines
 ansible_user: ansibleuser
 systemd_dir: /etc/systemd/system
@@ -41,11 +41,11 @@ extra_agent_args: >-
   {{ extra_args }}
 
 # image tag for kube-vip
-kube_vip_tag_version: "v0.5.6"
+kube_vip_tag_version: "v0.5.5"
 
 # image tag for metal lb
-metal_lb_speaker_tag_version: "v0.13.7"
+metal_lb_speaker_tag_version: "v0.13.6"
-metal_lb_controller_tag_version: "v0.13.7"
+metal_lb_controller_tag_version: "v0.13.6"
 
 # metallb ip range for load balancer
 metal_lb_ip_range: "192.168.30.80-192.168.30.90"

molecule/default/molecule.yml

@@ -3,73 +3,56 @@ dependency:
   name: galaxy
 driver:
   name: vagrant
-platforms:
+.platform_presets:
-
+  - &control
-  - name: control1
-    box: generic/ubuntu2204
     memory: 2048
     cpus: 2
     groups:
       - k3s_cluster
       - master
+  - &node
+    memory: 2048
+    cpus: 2
+    groups:
+      - k3s_cluster
+      - node
+  - &debian
+    box: generic/debian11
+  - &rocky
+    box: generic/rocky9
+  - &ubuntu
+    box: generic/ubuntu2204
+    config_options:
+      # We currently can not use public-key based authentication on Ubuntu 22.04,
+      # see: https://github.com/chef/bento/issues/1405
+      ssh.username: "vagrant"
+      ssh.password: "vagrant"
+platforms:
+  - <<: [*control, *ubuntu]
+    name: control1
     interfaces:
       - network_name: private_network
         ip: 192.168.30.38
-    config_options:
+  - <<: [*control, *debian]
-      # We currently can not use public-key based authentication on Ubuntu 22.04,
+    name: control2
-      # see: https://github.com/chef/bento/issues/1405
-      ssh.username: "vagrant"
-      ssh.password: "vagrant"
-
-  - name: control2
-    box: generic/debian11
-    memory: 2048
-    cpus: 2
-    groups:
-      - k3s_cluster
-      - master
     interfaces:
       - network_name: private_network
         ip: 192.168.30.39
-
+  - <<: [*control, *rocky]
-  - name: control3
+    name: control3
-    box: generic/rocky9
-    memory: 2048
-    cpus: 2
-    groups:
-      - k3s_cluster
-      - master
     interfaces:
       - network_name: private_network
         ip: 192.168.30.40
-
+  - <<: [*node, *ubuntu]
-  - name: node1
+    name: node1
-    box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
-    groups:
-      - k3s_cluster
-      - node
     interfaces:
       - network_name: private_network
         ip: 192.168.30.41
-    config_options:
+  - <<: [*node, *rocky]
-      # We currently can not use public-key based authentication on Ubuntu 22.04,
+    name: node2
-      # see: https://github.com/chef/bento/issues/1405
-      ssh.username: "vagrant"
-      ssh.password: "vagrant"
-
-  - name: node2
-    box: generic/rocky9
-    memory: 2048
-    cpus: 2
-    groups:
-      - k3s_cluster
-      - node
     interfaces:
       - network_name: private_network
         ip: 192.168.30.42
-
 provisioner:
   name: ansible
   playbooks:

molecule/ipv6/molecule.yml

@@ -3,39 +3,37 @@ dependency:
   name: galaxy
 driver:
   name: vagrant
-platforms:
+.platform_presets:
-
+  - &control
-  - name: control1
-    box: generic/ubuntu2204
     memory: 2048
     cpus: 2
     groups:
       - k3s_cluster
       - master
-    interfaces:
+  - &node
-      - network_name: private_network
-        ip: fdad:bad:ba55::de:11
-    config_options:
-      # We currently can not use public-key based authentication on Ubuntu 22.04,
-      # see: https://github.com/chef/bento/issues/1405
-      ssh.username: "vagrant"
-      ssh.password: "vagrant"
-
-  - name: node1
-    box: generic/ubuntu2204
     memory: 2048
     cpus: 2
     groups:
       - k3s_cluster
       - node
-    interfaces:
+  - &ubuntu
-      - network_name: private_network
+    box: generic/ubuntu2204
-        ip: fdad:bad:ba55::de:21
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405
       ssh.username: "vagrant"
       ssh.password: "vagrant"
+platforms:
+  - <<: [*control, *ubuntu]
+    name: control1
+    interfaces:
+      - network_name: private_network
+        ip: fdad:bad:ba55::de:11
+  - <<: [*node, *ubuntu]
+    name: node1
+    interfaces:
+      - network_name: private_network
+        ip: fdad:bad:ba55::de:21
 provisioner:
   name: ansible
   playbooks:

reboot.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-ansible-playbook reboot.yml -i inventory/my-cluster/hosts.ini

reboot.yml

@@ -1,9 +0,0 @@
----
-- name: Reboot k3s_cluster
-  hosts: k3s_cluster
-  gather_facts: yes
-  become: yes
-  tasks:
-    - name: Reboot the nodes (and Wait upto 5 mins max)
-      reboot:
-        reboot_timeout: 300

requirements.in

@@ -1,12 +0,0 @@
-ansible-core>=2.13.5
-ansible-lint>=6.8.6
-jmespath>=1.0.1
-jsonpatch>=1.32
-kubernetes>=25.3.0
-molecule-vagrant>=1.0.0
-molecule>=4.0.3
-netaddr>=0.8.0
-pre-commit>=2.20.0
-pre-commit-hooks>=1.3.1
-pyyaml>=6.0
-yamllint>=1.28.0

requirements.txt

@@ -1,228 +1,72 @@
-#
+ansible-compat==2.2.1
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
-#
-#    pip-compile requirements.in
-#
-ansible-compat==2.2.4
-    # via
-    #   ansible-lint
-    #   molecule
 ansible-core==2.13.5
-    # via
+ansible-lint==6.8.4
-    #   -r requirements.in
-    #   ansible-lint
-ansible-lint==6.8.6
-    # via -r requirements.in
 arrow==1.2.3
-    # via jinja2-time
 attrs==22.1.0
-    # via jsonschema
 binaryornot==0.4.4
-    # via cookiecutter
 black==22.10.0
-    # via ansible-lint
 bracex==2.3.post1
-    # via wcmatch
 cachetools==5.2.0
-    # via google-auth
+Cerberus==1.3.2
 certifi==2022.9.24
-    # via
-    #   kubernetes
-    #   requests
 cffi==1.15.1
-    # via cryptography
-cfgv==3.3.1
-    # via pre-commit
 chardet==5.0.0
-    # via binaryornot
 charset-normalizer==2.1.1
-    # via requests
 click==8.1.3
-    # via
-    #   black
-    #   click-help-colors
-    #   cookiecutter
-    #   molecule
 click-help-colors==0.9.1
-    # via molecule
 commonmark==0.9.1
-    # via rich
 cookiecutter==2.1.1
-    # via molecule
+cryptography==38.0.1
-cryptography==38.0.3
-    # via ansible-core
-distlib==0.3.6
-    # via virtualenv
 distro==1.8.0
-    # via selinux
 enrich==1.2.7
-    # via molecule
 filelock==3.8.0
-    # via
+google-auth==2.13.0
-    #   ansible-lint
-    #   virtualenv
-google-auth==2.14.0
-    # via kubernetes
-identify==2.5.8
-    # via pre-commit
 idna==3.4
-    # via requests
 importlib-resources==5.10.0
-    # via jsonschema
+Jinja2==3.1.2
-jinja2==3.1.2
-    # via
-    #   ansible-core
-    #   cookiecutter
-    #   jinja2-time
-    #   molecule
-    #   molecule-vagrant
 jinja2-time==0.2.0
-    # via cookiecutter
 jmespath==1.0.1
-    # via -r requirements.in
 jsonpatch==1.32
-    # via -r requirements.in
 jsonpointer==2.3
-    # via jsonpatch
+jsonschema==4.16.0
-jsonschema==4.17.0
+kubernetes==24.2.0
-    # via
+MarkupSafe==2.1.1
-    #   ansible-compat
+molecule==4.0.1
-    #   ansible-lint
-    #   molecule
-kubernetes==25.3.0
-    # via -r requirements.in
-markupsafe==2.1.1
-    # via jinja2
-molecule==4.0.3
-    # via
-    #   -r requirements.in
-    #   molecule-vagrant
 molecule-vagrant==1.0.0
-    # via -r requirements.in
 mypy-extensions==0.4.3
-    # via black
 netaddr==0.8.0
-    # via -r requirements.in
-nodeenv==1.7.0
-    # via pre-commit
 oauthlib==3.2.2
-    # via requests-oauthlib
 packaging==21.3
-    # via
-    #   ansible-compat
-    #   ansible-core
-    #   ansible-lint
-    #   molecule
 pathspec==0.10.1
-    # via
-    #   black
-    #   yamllint
 pkgutil-resolve-name==1.3.10
-    # via jsonschema
 platformdirs==2.5.2
-    # via
-    #   black
-    #   virtualenv
 pluggy==1.0.0
-    # via molecule
 pre-commit==2.20.0
-    # via -r requirements.in
-pre-commit-hooks==4.3.0
-    # via -r requirements.in
 pyasn1==0.4.8
-    # via
-    #   pyasn1-modules
-    #   rsa
 pyasn1-modules==0.2.8
-    # via google-auth
 pycparser==2.21
-    # via cffi
+Pygments==2.13.0
-pygments==2.13.0
-    # via rich
 pyparsing==3.0.9
-    # via packaging
+pyrsistent==0.18.1
-pyrsistent==0.19.2
-    # via jsonschema
 python-dateutil==2.8.2
-    # via
-    #   arrow
-    #   kubernetes
 python-slugify==6.1.2
-    # via cookiecutter
 python-vagrant==1.0.0
-    # via molecule-vagrant
+PyYAML==6.0
-pyyaml==6.0
-    # via
-    #   -r requirements.in
-    #   ansible-compat
-    #   ansible-core
-    #   ansible-lint
-    #   cookiecutter
-    #   kubernetes
-    #   molecule
-    #   molecule-vagrant
-    #   pre-commit
-    #   yamllint
 requests==2.28.1
-    # via
-    #   cookiecutter
-    #   kubernetes
-    #   requests-oauthlib
 requests-oauthlib==1.3.1
-    # via kubernetes
 resolvelib==0.8.1
-    # via ansible-core
 rich==12.6.0
-    # via
-    #   ansible-lint
-    #   enrich
-    #   molecule
 rsa==4.9
-    # via google-auth
+ruamel.yaml==0.17.21
-ruamel-yaml==0.17.21
+ruamel.yaml.clib==0.2.7
-    # via
-    #   ansible-lint
-    #   pre-commit-hooks
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 selinux==0.2.1
-    # via molecule-vagrant
 six==1.16.0
-    # via
-    #   google-auth
-    #   kubernetes
-    #   python-dateutil
 subprocess-tee==0.3.5
-    # via ansible-compat
 text-unidecode==1.3
-    # via python-slugify
-toml==0.10.2
-    # via pre-commit
 tomli==2.0.1
-    # via
-    #   black
-    #   pre-commit-hooks
 typing-extensions==4.4.0
-    # via
-    #   black
-    #   rich
 urllib3==1.26.12
-    # via
-    #   kubernetes
-    #   requests
-virtualenv==20.16.6
-    # via pre-commit
 wcmatch==8.4.1
-    # via ansible-lint
+websocket-client==1.4.1
-websocket-client==1.4.2
-    # via kubernetes
 yamllint==1.28.0
-    # via
-    #   -r requirements.in
-    #   ansible-lint
 zipp==3.10.0
-    # via importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

roles/k3s/master/templates/metallb.crds.j2

@@ -77,7 +77,7 @@ spec:
                     aggregationLength:
                       default: 32
                       description: The aggregation-length advertisement option lets
-                        you "roll up" the /32s into a larger prefix.
+                        you “roll up” the /32s into a larger prefix.
                       format: int32
                       minimum: 1
                       type: integer
@@ -167,7 +167,7 @@ spec:
                     aggregationLength:
                       default: 32
                       description: The aggregation-length advertisement option lets
-                        you "roll up" the /32s into a larger prefix.
+                        you “roll up” the /32s into a larger prefix.
                       format: int32
                       minimum: 1
                       type: integer
@@ -359,7 +359,7 @@ spec:
               aggregationLength:
                 default: 32
                 description: The aggregation-length advertisement option lets you
-                  "roll up" the /32s into a larger prefix. Defaults to 32. Works for
+                  “roll up” the /32s into a larger prefix. Defaults to 32. Works for
                   IPv4 addresses.
                 format: int32
                 minimum: 1
@@ -367,7 +367,7 @@ spec:
               aggregationLengthV6:
                 default: 128
                 description: The aggregation-length advertisement option lets you
-                  "roll up" the /128s into a larger prefix. Defaults to 128. Works
+                  “roll up” the /128s into a larger prefix. Defaults to 128. Works
                   for IPv6 addresses.
                 format: int32
                 type: integer