Merge 59e76924b8 into edf0c9eebd

.github/workflows/cache.yml

@@ -26,7 +26,7 @@ jobs:
         id: cache-ansible
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.yml') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
           restore-keys: |
             ansible-
 

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     env:
       PYTHON_VERSION: "3.11"
 
@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.yml') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
 
       - name: Install dependencies
         run: |
@@ -46,7 +46,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0

.github/workflows/test.yml

@@ -22,6 +22,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Restore Ansible cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
@@ -61,6 +67,14 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
+      - name: Cache Ansible
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-ansible-
+
       - name: Test with molecule
         run: molecule test --scenario-name ${{ matrix.scenario }}
         timeout-minutes: 90

Brewfile

@@ -1,5 +1,4 @@
 tap "homebrew/bundle"
 tap "homebrew/cask-versions"
-
-cask "virtualbox"
+cask "virtualbox6"
 cask "vagrant"

molecule/default/molecule.yml

@@ -7,8 +7,8 @@ platforms:
 
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -23,8 +23,8 @@ platforms:
 
   - name: control2
     box: generic/debian11
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -34,8 +34,8 @@ platforms:
 
   - name: control3
     box: generic/rocky9
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -45,8 +45,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - node
@@ -61,8 +61,8 @@ platforms:
 
   - name: node2
     box: generic/rocky9
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - node
@@ -72,8 +72,6 @@ platforms:
 
 provisioner:
   name: ansible
-  env:
-    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml

molecule/ipv6/molecule.yml

@@ -6,8 +6,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -22,8 +22,8 @@ platforms:
 
   - name: control2
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -38,8 +38,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 1024
+    cpus: 2
     groups:
       - k3s_cluster
       - node
@@ -53,8 +53,6 @@ platforms:
       ssh.password: "vagrant"
 provisioner:
   name: ansible
-  env:
-    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml

molecule/single_node/molecule.yml

@@ -6,8 +6,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405
@@ -21,8 +21,6 @@ platforms:
         ip: 192.168.30.50
 provisioner:
   name: ansible
-  env:
-    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml