fix remaining lint issues

ericsysmin · Mar 5, 2024 · 9700f19 · 9700f19
1 parent be451d6
commit 9700f19
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 50 deletions.
diff --git a/.github/workflows/kompose.yml b/.github/workflows/kompose.yml
@@ -34,18 +34,20 @@ jobs:
         with:
           path: ansible_collections/ericsysmin/kubernetes
 
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install dependencies
         run: |
-          sudo apt install docker
+          sudo apt install apt-transport-https ca-certificates curl software-properties-common
+          curl -fsSL https://get.docker.com -o get-docker.sh
+          sudo sh get-docker.sh
           python -m pip install --upgrade pip
-          pip install molecule yamllint ansible-lint docker
+          pip install ansible molecule yamllint ansible-lint molecule-plugins[docker]
 
-      - name: Run role test
+      - name: Run role tests
         run: >-
           molecule --version &&
           ansible --version &&

diff --git a/.github/workflows/kubectl.yml b/.github/workflows/kubectl.yml
@@ -21,13 +21,11 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          - distro: centos:7
-            command: /usr/sbin/init
-          - {distro: centos-8, command: /usr/sbin/init}
-          - {distro: ubuntu-18.04, command: /lib/systemd/systemd}
-          - {distro: ubuntu-20.04, command: /lib/systemd/systemd}
-          - {distro: ubuntu-22.04, command: /lib/systemd/systemd}
-          - {distro: debian-10, command: /lib/systemd/systemd}
+          - { distro: centos-8, command: /usr/sbin/init }
+          - { distro: ubuntu-18.04, command: /lib/systemd/systemd }
+          - { distro: ubuntu-20.04, command: /lib/systemd/systemd }
+          - { distro: ubuntu-22.04, command: /lib/systemd/systemd }
+          - { distro: debian-10, command: /lib/systemd/systemd }
         collection_role:
           - kubectl
     steps:
@@ -55,4 +53,4 @@ jobs:
           ansible --version &&
           MOLECULE_COMMAND=${{ matrix.molecule_distro.command }}
           MOLECULE_DISTRO=${{ matrix.molecule_distro.distro }}
-          molecule --debug test -s ${{ matrix.collection_role }}
+          molecule --debug test -s ${{ matrix.collection_role }}
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -3,17 +3,17 @@ releases:
   1.0.0:
     changes:
       major_changes:
-      - added recent versions of OS tests
-      - ensured existing role works with newer OS releases
-      - updated all tasks to meet newer ansible-lint requirements
-      - updated molecule testing
+        - added recent versions of OS tests
+        - ensured existing role works with newer OS releases
+        - updated all tasks to meet newer ansible-lint requirements
+        - updated molecule testing
       release_summary: 1.0.0 release of the Kubernetes collection
     objects:
       role:
-      - description: Ansible role to deploy kompose
-        name: kompose
-        namespace: null
-      - description: Ansible role to deploy kubectl
-        name: kubectl
-        namespace: null
-    release_date: '2024-03-05'
+        - description: Ansible role to deploy kompose
+          name: kompose
+          namespace: null
+        - description: Ansible role to deploy kubectl
+          name: kubectl
+          namespace: null
+    release_date: "2024-03-05"
diff --git a/changelogs/config.yaml b/changelogs/config.yaml
@@ -8,27 +8,27 @@ mention_ancestor: true
 new_plugins_after_name: removed_features
 notesdir: fragments
 output_formats:
-- rst
+  - rst
 prelude_section_name: release_summary
 prelude_section_title: Release Summary
 sanitize_changelog: true
 sections:
-- - major_changes
-  - Major Changes
-- - minor_changes
-  - Minor Changes
-- - breaking_changes
-  - Breaking Changes / Porting Guide
-- - deprecated_features
-  - Deprecated Features
-- - removed_features
-  - Removed Features (previously deprecated)
-- - security_fixes
-  - Security Fixes
-- - bugfixes
-  - Bugfixes
-- - known_issues
-  - Known Issues
+  - - major_changes
+    - Major Changes
+  - - minor_changes
+    - Minor Changes
+  - - breaking_changes
+    - Breaking Changes / Porting Guide
+  - - deprecated_features
+    - Deprecated Features
+  - - removed_features
+    - Removed Features (previously deprecated)
+  - - security_fixes
+    - Security Fixes
+  - - bugfixes
+    - Bugfixes
+  - - known_issues
+    - Known Issues
 title: Ericsysmin.Kubernetes
 trivial_section_name: trivial
 use_fqcn: true
diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -0,0 +1 @@
+requires_ansible: '>=2.14.0'
diff --git a/molecule/kompose/molecule.yml b/molecule/kompose/molecule.yml
@@ -18,4 +18,4 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/molecule/kompose/verify.yml b/molecule/kompose/verify.yml
@@ -4,6 +4,6 @@
 - name: Verify
   hosts: all
   tasks:
-  - name: Example assertion
-    assert:
-      that: true
+    - name: Example assertion
+      ansible.builtin.assert:
+        that: true
diff --git a/molecule/kubectl/molecule.yml b/molecule/kubectl/molecule.yml
@@ -18,4 +18,4 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/molecule/kubectl/verify.yml b/molecule/kubectl/verify.yml
@@ -4,6 +4,6 @@
 - name: Verify
   hosts: all
   tasks:
-  - name: Example assertion
-    assert:
-      that: true
+    - name: Example assertion
+      ansible.builtin.assert:
+        that: true