Merge pull request #3 from XevoInc/merge-upstream

Merge upstream

.github/stale.yml

@@ -0,0 +1,60 @@
+---
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale
+# label is closed. Set to false to disable. If disabled, issues still need to be
+# closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale.
+# Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set
+# to `[]` to disable
+exemptLabels:
+  - security
+  - planned
+  - priority/critical
+  - lifecycle/frozen
+  - verified
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: lifecycle/stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    PRs go stale after 90 days of inactivity.
+    If there is no further activity, the PR will be closed in another 30 days.
+
+  unmarkComment: >-
+    This pull request is no longer stale.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity.
+
+issues:
+  markComment: |-
+    Issues go stale after 90 days of inactivity.
+    If there is no further activity, the issue will be closed in another 30 days.
+
+  unmarkComment: >-
+    This issue is no longer stale.
+
+  closeComment: >-
+    This issue has been closed due to inactivity.

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 'on':
   push:
     branches:
-      - master
+      - main
   pull_request:
   schedule:
     - cron: '0 6 * * *'
@@ -30,7 +30,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 
       - name: Run sanity tests on Python ${{ matrix.python_version }}
-        run: ansible-test sanity --docker -v --color --python ${{ matrix.python_version }}
+        run: make test-sanity PYTHON_VERSION=${{ matrix.python_version }}
         working-directory: ./ansible_collections/community/kubernetes
 
   integration:
@@ -53,7 +53,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 
       - name: Run integration tests on Python ${{ matrix.python_version }}
-        run: ansible-test integration --docker -v --color --retry-on-error --python ${{ matrix.python_version }} --continue-on-error --diff --coverage
+        run: make test-integration PYTHON_VERSION=${{ matrix.python_version }}
         working-directory: ./ansible_collections/community/kubernetes
 
       - name: Generate coverage report.
@@ -76,24 +76,112 @@ jobs:
           path: ansible_collections/community/kubernetes
 
       - name: Set up KinD cluster
-        uses: engineerd/setup-kind@v0.3.0
+        uses: engineerd/setup-kind@v0.4.0
 
       - name: Set up Python ${{ matrix.python_version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python_version }}
 
       - name: Install molecule and openshift dependencies
-        run: pip install molecule yamllint openshift
+        run: pip install ansible molecule yamllint openshift flake8
+
+      # The latest release doesn't work with Molecule currently.
+      # See: https://github.com/ansible-community/molecule/issues/2757
+      # - name: Install ansible base, latest release.
+      #   run: |
+      #     pip uninstall -y ansible
+      #     pip install --pre ansible-base
+
+      # The devel branch doesn't work with Molecule currently.
+      # See: https://github.com/ansible-community/molecule/issues/2757
+      # - name: Install ansible base (devel branch)
+      #   run: |
+      #     pip uninstall -y ansible
+      #     pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
+
+      - name: Create default collection path symlink
+        run: |
+          mkdir -p /home/runner/.ansible
+          ln -s /home/runner/work/kubernetes/kubernetes /home/runner/.ansible/collections
+
+      - name: Run molecule default test scenario
+        run: make test-molecule
+        working-directory: ./ansible_collections/community/kubernetes
+
+  downstream-sanity-29:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python_version: ['3.6']
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          path: ansible_collections/community/kubernetes
+
+      - name: Set up Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python_version }}
 
       - name: Install ansible base (devel branch)
-        run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
+        run: pip install "ansible>=2.9.0,<2.10.0"
+
+      - name: Run sanity tests on Python ${{ matrix.python_version }}
+        run: make downstream-test-sanity
+        working-directory: ./ansible_collections/community/kubernetes
+
+  downstream-integration-29:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python_version: ['3.6']
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          path: ansible_collections/community/kubernetes
+
+      - name: Set up Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Install ansible base (devel branch)
+        run: pip install "ansible>=2.9.0,<2.10.0"
+
+      - name: Run integration tests on Python ${{ matrix.python_version }}
+        run: make downstream-test-integration
+        working-directory: ./ansible_collections/community/kubernetes
+
+  downstream-molecule-29:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python_version: ['3.7']
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          path: ansible_collections/community/kubernetes
+
+      - name: Set up KinD cluster
+        uses: engineerd/[email protected]
+
+      - name: Set up Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Install molecule and openshift dependencies
+        run: pip install "ansible>=2.9.0,<2.10.0" molecule yamllint openshift flake8
 
       - name: Create default collection path symlink
         run: |
           mkdir -p /home/runner/.ansible
           ln -s /home/runner/work/kubernetes/kubernetes /home/runner/.ansible/collections
 
       - name: Run molecule default test scenario
-        run: molecule test
+        run: make downstream-test-molecule
         working-directory: ./ansible_collections/community/kubernetes

.gitignore

@@ -6,6 +6,9 @@ __pycache__/
 # Galaxy artifacts.
 *.tar.gz
 
+# Changelog cache files.
+changelogs/.plugin-cache.yaml
+
 # Temporary test files.
 tests/output
 tests/integration/cloud-config-*

.yamllint

@@ -8,5 +8,9 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
+  document-start: disable
   line-length: disable
   truthy: disable
+  indentation:
+    spaces: 2
+    indent-sequences: consistent