Merge 4707002267 into edf0c9eebd

.github/workflows/cache.yml

@@ -21,14 +21,14 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
-      # - name: Cache Ansible
-      #   uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-      #   id: cache-ansible
-      #   with:
-      #     path: ~/.ansible/collections
-      #     key: ansible-${{ hashFiles('collections/requirements.yml') }}
-      #     restore-keys: |
-      #       ansible-
+      - name: Cache Ansible
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-ansible
+        with:
+          path: ~/.ansible/collections
+          key: ansible-${{ hashFiles('collections/requirements.yml') }}
+          restore-keys: |
+            ansible-
 
       - name: Install dependencies
         run: |
@@ -40,12 +40,12 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
-      # - name: Install ansible dependencies
-      #   if: steps.cache-ansible.outputs.cache-hit != 'true' # only run if false since this is just a cache step
-      #   run: |
-      #     echo "::group::Install Ansible role requirements from collections/requirements.yml"
-      #     ansible-galaxy install -r collections/requirements.yml
-      #     echo "::endgroup::"
+      - name: Install ansible dependencies
+        if: steps.cache-ansible.outputs.cache-hit != 'true' # only run if false since this is just a cache step
+        run: |
+          echo "::group::Install Ansible role requirements from collections/requirements.yml"
+          ansible-galaxy install -r collections/requirements.yml
+          echo "::endgroup::"
 
       - name: Cache Vagrant boxes
         id: cache-vagrant
@@ -69,13 +69,13 @@ jobs:
 
       - name: Update Homebrew
         if: | # only run if false since this is just a cache step
-          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true'
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
         run: |
           brew update --preinstall
 
       - name: Install Homebrew dependencies
         if: | # only run if false since this is just a cache step
-          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true'
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
         run: |
           env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 

.github/workflows/lint.yml

@@ -37,6 +37,10 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
+          echo "::group::Install Ansible role requirements from collections/requirements.yml"
+          ansible-galaxy install -r collections/requirements.yml
+          echo "::endgroup::"
+
       - name: Run pre-commit
         uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507 # 3.0.0
 

.github/workflows/test.yml

@@ -22,30 +22,10 @@ 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.yml') }}
-      - name: Configure VirtualBox
-        run: |-
-          sudo mkdir -p /etc/vbox
-          cat <<EOF | sudo tee -a /etc/vbox/networks.conf > /dev/null
-          * 192.168.30.0/24
-          * fdad:bad:ba55::/64
-          EOF
-
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'pip' # caching pip dependencies
-
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
-          path: |
-            ~/Library/Caches/Homebrew
+          path: ~/Library/Caches/Homebrew
           key: brew-${{ hashFiles('./Brewfile') }}
 
       - name: Update Homebrew
@@ -63,6 +43,14 @@ jobs:
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
           fail-on-cache-miss: true
 
+      - name: Configure VirtualBox
+        run: |-
+          sudo mkdir -p /etc/vbox
+          cat <<EOF | sudo tee -a /etc/vbox/networks.conf > /dev/null
+          * 192.168.30.0/24
+          * fdad:bad:ba55::/64
+          EOF
+
       - name: Install dependencies
         run: |
           echo "::group::Upgrade pip"

molecule/default/molecule.yml

@@ -8,7 +8,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -24,7 +24,7 @@ platforms:
   - name: control2
     box: generic/debian11
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -35,7 +35,7 @@ platforms:
   - name: control3
     box: generic/rocky9
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -46,7 +46,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
@@ -62,7 +62,7 @@ platforms:
   - name: node2
     box: generic/rocky9
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
@@ -84,6 +84,7 @@ provisioner:
 scenario:
   test_sequence:
     - dependency
+    - lint
     - cleanup
     - destroy
     - syntax

molecule/ipv6/molecule.yml

@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -23,7 +23,7 @@ platforms:
   - name: control2
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -39,7 +39,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
@@ -65,6 +65,7 @@ provisioner:
 scenario:
   test_sequence:
     - dependency
+    - lint
     - cleanup
     - destroy
     - syntax

molecule/single_node/molecule.yml

@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 2
+    cpus: 1
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405
@@ -33,6 +33,7 @@ provisioner:
 scenario:
   test_sequence:
     - dependency
+    - lint
     - cleanup
     - destroy
     - syntax

requirements.in

@@ -1,10 +1,10 @@
-ansible-core>=2.16.2
+ansible-core>=2.13.5
 jmespath>=1.0.1
-jsonpatch>=1.33
-kubernetes>=29.0.0
-molecule-vagrant>=2.0.0
-molecule>=6.0.3
-netaddr>=0.10.1
-pre-commit>=3.6.0
-pre-commit-hooks>=4.5.0
-pyyaml>=6.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

requirements.txt

@@ -4,117 +4,127 @@
 #
 #    pip-compile requirements.in
 #
-ansible-compat==4.1.11
+ansible-compat==3.0.1
     # via molecule
-ansible-core==2.16.2
+ansible-core==2.15.4
     # via
     #   -r requirements.in
     #   ansible-compat
-    #   molecule
-attrs==23.2.0
-    # via
-    #   jsonschema
-    #   referencing
-bracex==2.4
-    # via wcmatch
-cachetools==5.3.2
+arrow==1.2.3
+    # via jinja2-time
+attrs==22.1.0
+    # via jsonschema
+binaryornot==0.4.4
+    # via cookiecutter
+cachetools==5.2.0
     # via google-auth
-certifi==2023.11.17
+certifi==2022.9.24
     # via
     #   kubernetes
     #   requests
-cffi==1.16.0
+cffi==1.15.1
     # via cryptography
-cfgv==3.4.0
+cfgv==3.3.1
     # via pre-commit
-charset-normalizer==3.3.2
+chardet==5.0.0
+    # via binaryornot
+charset-normalizer==2.1.1
     # via requests
-click==8.1.7
+click==8.1.3
     # via
     #   click-help-colors
+    #   cookiecutter
     #   molecule
-click-help-colors==0.9.4
+click-help-colors==0.9.1
     # via molecule
-cryptography==41.0.7
+commonmark==0.9.1
+    # via rich
+cookiecutter==2.1.1
+    # via molecule
+cryptography==38.0.3
     # via ansible-core
-distlib==0.3.8
+distlib==0.3.6
     # via virtualenv
-distro==1.9.0
+distro==1.8.0
     # via selinux
 enrich==1.2.7
     # via molecule
-filelock==3.13.1
+filelock==3.8.0
     # via virtualenv
-google-auth==2.26.2
+google-auth==2.14.0
     # via kubernetes
-identify==2.5.33
+identify==2.5.8
     # via pre-commit
-idna==3.6
+idna==3.4
     # via requests
-jinja2==3.1.3
+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.33
     # via -r requirements.in
-jsonpointer==2.4
+jsonpointer==2.3
     # via jsonpatch
-jsonschema==4.21.1
+jsonschema==4.17.0
     # via
     #   ansible-compat
     #   molecule
-jsonschema-specifications==2023.12.1
-    # via jsonschema
-kubernetes==29.0.0
+kubernetes==25.3.0
     # via -r requirements.in
-markdown-it-py==3.0.0
-    # via rich
-markupsafe==2.1.4
+markupsafe==2.1.1
     # via jinja2
-mdurl==0.1.2
-    # via markdown-it-py
-molecule==6.0.3
+molecule==4.0.4
     # via
     #   -r requirements.in
     #   molecule-vagrant
-molecule-vagrant==2.0.0
+molecule-vagrant==1.0.0
     # via -r requirements.in
-netaddr==0.10.1
+netaddr==0.10.0
     # via -r requirements.in
-nodeenv==1.8.0
+nodeenv==1.7.0
     # via pre-commit
 oauthlib==3.2.2
-    # via
-    #   kubernetes
-    #   requests-oauthlib
-packaging==23.2
+    # via requests-oauthlib
+packaging==21.3
     # via
     #   ansible-compat
     #   ansible-core
     #   molecule
-platformdirs==4.1.0
+platformdirs==2.5.2
     # via virtualenv
-pluggy==1.3.0
+pluggy==1.0.0
     # via molecule
-pre-commit==3.6.0
+pre-commit==2.21.0
     # via -r requirements.in
 pre-commit-hooks==4.5.0
     # via -r requirements.in
-pyasn1==0.5.1
+pyasn1==0.4.8
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.3.0
+pyasn1-modules==0.2.8
     # via google-auth
 pycparser==2.21
     # via cffi
-pygments==2.17.2
+pygments==2.13.0
     # via rich
+pyparsing==3.0.9
+    # via packaging
+pyrsistent==0.19.2
+    # via jsonschema
 python-dateutil==2.8.2
-    # via kubernetes
+    # via
+    #   arrow
+    #   kubernetes
+python-slugify==6.1.2
+    # via cookiecutter
 python-vagrant==1.0.0
     # via molecule-vagrant
 pyyaml==6.0.1
@@ -122,53 +132,46 @@ pyyaml==6.0.1
     #   -r requirements.in
     #   ansible-compat
     #   ansible-core
+    #   cookiecutter
     #   kubernetes
     #   molecule
     #   molecule-vagrant
     #   pre-commit
-referencing==0.32.1
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-requests==2.31.0
+requests==2.28.1
     # via
+    #   cookiecutter
     #   kubernetes
     #   requests-oauthlib
 requests-oauthlib==1.3.1
     # via kubernetes
-resolvelib==1.0.1
+resolvelib==0.8.1
     # via ansible-core
-rich==13.7.0
+rich==12.6.0
     # via
     #   enrich
     #   molecule
-rpds-py==0.17.1
-    # via
-    #   jsonschema
-    #   referencing
 rsa==4.9
     # via google-auth
-ruamel-yaml==0.18.5
+ruamel-yaml==0.17.21
     # via pre-commit-hooks
-ruamel-yaml-clib==0.2.8
-    # via ruamel-yaml
-selinux==0.3.0
+selinux==0.2.1
     # via molecule-vagrant
 six==1.16.0
     # via
+    #   google-auth
     #   kubernetes
     #   python-dateutil
 subprocess-tee==0.4.1
     # via ansible-compat
-urllib3==2.1.0
+text-unidecode==1.3
+    # via python-slugify
+urllib3==1.26.12
     # via
     #   kubernetes
     #   requests
-virtualenv==20.25.0
+virtualenv==20.16.6
     # via pre-commit
-wcmatch==8.5
-    # via molecule
-websocket-client==1.7.0
+websocket-client==1.4.2
     # via kubernetes
 
 # The following packages are considered to be unsafe in a requirements file: