Resolve merge conflict

.ansible-lint

@@ -1,2 +1,4 @@
+---
+
 skip_list:
     - '106'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,54 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+<!-- Please first verify that your issue is not already reported on GitHub -->
+<!-- Complete *all* sections as described. -->
+
+### Summary
+
+<!-- Explain the problem briefly below -->
+
+### Issue Type
+
+- Bug Report
+
+### Controller Environment and Configuration
+
+<!-- Please re-run your playbook with: `-e "pyratlabs_issue_controller_dump=true"` -->
+<!-- Example: `ansible-playbook -e "pyratlabs_issue_controller_dump=true" /path/to/playbook.yml` -->
+<!-- Then please copy-and-paste the contents (or attach) to this issue. -->
+
+```text
+
+```
+
+
+### Steps to Reproduce
+
+<!-- Describe exactly how to reproduce the problem, using a minimal test-case -->
+
+<!-- Paste example playbooks or commands between quotes below -->
+
+```yaml
+
+```
+
+### Expected Result
+
+<!-- Describe what you expected to happen when running the steps above -->
+
+```text
+
+```
+
+### Actual Result
+
+<!-- Describe what actually happened. If possible run with extra verbosity (-vvvv) -->
+
+<!-- Paste verbatim command output between quotes -->
+
+```text
+
+```

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,3 @@
+---
+
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,33 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+---
+
+<!-- Please first verify that your feature was not already discussed on GitHub -->
+<!-- Complete *all* sections as described, this form is processed automatically -->
+
+### Summary
+
+<!-- Describe the new feature/improvement briefly below -->
+
+### Issue Type
+
+- Feature Request
+
+### User Story
+
+<!-- If you can, please provide a user story, if you don't know what this is don't worry, it will be refined by PyratLabs. -->
+<!-- Describe who would use it, why it is needed and the benefit -->
+
+_As a_ <!-- (Insert Persona) --> \
+_I want to_ <!-- (Insert Action) --> \
+_So that_ <!-- (Insert Benefit) -->
+
+### Additional Information
+
+<!-- Please include any relevant documentation, URLs, etc. -->
+<!-- Paste example playbooks or commands between quotes below -->
+
+```yaml
+
+```

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,37 @@
+## TITLE
+
+### Summary
+
+<!-- Describe the change below, including rationale and design decisions -->
+
+<!-- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
+
+### Issue type
+
+<!-- Pick one below and delete the rest -->
+- Bugfix
+- Documentation
+- Feature
+
+### Test instructions
+
+<!-- Please provide instructions for testing this PR -->
+
+### Acceptance Criteria
+
+<!-- Please list criteria required to ensure this change has been sufficiently reviewed.  -->
+
+<!-- Example ticklist:
+  - [ ] Travis-CI Build passes.
+  - [ ] Documentation updated.
+-->
+
+### Additional Information
+
+<!-- Include additional information to help people understand the change here -->
+
+<!-- Paste verbatim command output below, e.g. before and after your change -->
+
+```text
+
+```

.gitignore

@@ -8,3 +8,4 @@ vagramt/fetch
 vagrant/ubuntu-*.log
 __pycache__
 ansible.cfg
+pyratlabs-issue-dump.txt

.travis.yml

@@ -13,40 +13,35 @@ env:
     - MOLECULE_SCENARIO: default
   matrix:
     - MOLECULE_DISTRO: geerlingguy/docker-debian10-ansible:latest
+    - MOLECULE_DISTRO: geerlingguy/docker-ubuntu2004-ansible:latest
 
     # Test installing docker
     - MOLECULE_DISTRO: geerlingguy/docker-centos7-ansible:latest
-      MOLECULE_PLAYBOOK: playbook-docker.yml
+      MOLECULE_SCENARIO: docker
     - MOLECULE_DISTRO: geerlingguy/docker-ubuntu1804-ansible:latest
-      MOLECULE_PLAYBOOK: playbook-docker.yml
+      MOLECULE_SCENARIO: docker
     - MOLECULE_DISTRO: geerlingguy/docker-amazonlinux2-ansible:latest
-      MOLECULE_PLAYBOOK: playbook-docker.yml
-
-    # Test using alternate port and using wireguard as the flannel backend
-    - MOLECULE_DISTRO: geerlingguy/docker-centos7-ansible:latest
-      MOLECULE_PLAYBOOK: playbook-docker-altport-wireguard.yml
+      MOLECULE_SCENARIO: docker
 
     # Test disabling all deployments
     - MOLECULE_DISTRO: geerlingguy/docker-fedora31-ansible:latest
-      MOLECULE_PLAYBOOK: playbook-no-deploy.yml
+      MOLECULE_SCENARIO: nodeploy
 
-    # Test multiple controllers in control plane with PostgreSQL
+    # Test multiple control nodes in control plane with PostgreSQL
     - MOLECULE_DISTRO: geerlingguy/docker-fedora29-ansible:latest
-      MOLECULE_SCENARIO: highavailability
+      MOLECULE_SCENARIO: highavailabilitydb
 
-    # Test multiple controllers with auto deploying manifests
+    # Test multiple control nodes with auto deploying manifests
     - MOLECULE_DISTRO: geerlingguy/docker-fedora30-ansible:latest
-      MOLECULE_SCENARIO: highavailability
-      MOLECULE_PLAYBOOK: playbook-auto-deploying-manifests.yml
+      MOLECULE_SCENARIO: autodeploy
 
-    # Test multiple controllers in control plane with Etcd
+    # Test multiple control nodes in control plane with Etcd
     - MOLECULE_DISTRO: geerlingguy/docker-centos8-ansible:latest
-      MOLECULE_SCENARIO: highavailability
-      MOLECULE_PLAYBOOK: playbook-etcd.yml
+      MOLECULE_SCENARIO: highavailabilityetcd
 
 install:
   # Install test dependencies.
-  - pip install molecule[docker] docker jmespath ansible-lint
+  - pip install -r molecule/requirements.txt
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.

.yamllint

@@ -1,5 +1,5 @@
 ---
-
+# Based on ansible-lint config
 extends: default
 
 rules:
@@ -9,5 +9,25 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
   line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
   truthy: disable

CHANGELOG.md

@@ -0,0 +1,55 @@
+# Change Log
+
+<!--
+## DATE, vx.x.x
+
+### Notable changes
+
+### Breaking changes
+
+### Contributors
+-->
+
+## 2020-11-29, v2.0.0
+
+### Notable changes
+
+  - #64 - Initial release of v2.0.0 of
+    [ansible-role-k3s](https://github.com/PyratLabs/ansible-role-k3s).
+  - Minimum supported k3s version now: v1.19.1+k3s1
+  - Minimum supported Ansible version now: v2.10.0
+  - #62 - Remove all references to the word "master".
+  - #53 - Move to file-based configuration.
+  - Refactored to avoid duplication in code and make contribution easier.
+  - Validation checks moved to using variables defined in `vars/`
+
+### Breaking changes
+
+#### File based configuration
+
+Issue #53
+
+With the release of v1.19.1+k3s1, this role has moved to file-based
+configuration of k3s. This requires manuall translation of v1 configuration
+variables into configuration file format.
+
+Please see: https://rancher.com/docs/k3s/latest/en/installation/install-options/#configuration-file
+
+#### Minimum supported k3s version
+
+As this role now relies on file-based configuration, the v2.x release of this
+role will only support v1.19+ of k3s. If you are not in a position to update
+k3s you will need to continue using the v1.x release of this role, which will
+be supported until March 2021<!-- 1 year after k8s v1.18 release -->.
+
+#### Minimum supported ansible version
+
+This role now only supports Ansible v2.10+, this is because it has moved on to
+using FQDNs, with the exception of `set_fact` tasks which have
+[been broken](https://github.com/ansible/ansible/issues/72319) and the fixes
+have [not yet been backported to v2.10](https://github.com/ansible/ansible/pull/71824).
+
+The use of FQDNs allows for custom modules to be introduced to override task
+behavior. If this role requires a custom ansible module to be introduced then
+this can be added as a dependency and targeted specifically by using the
+correct FQDN.

CONTRIBUTING.md

@@ -0,0 +1,46 @@
+# Contribution Guidelines
+
+Thank you for taking time to contribute to this Ansible role.
+
+There are a number of ways that you can contribute to this project, not all of
+them requiring you to be able to write code. Below is a list of suggested
+contributions welcomed by the community:
+
+  - Submit bug reports in GitHub issues
+  - Comment on bug reports with futher information or suggestions
+  - Suggest new features
+  - Create Pull Requests fixing bugs or adding new features
+  - Update and improve documentation
+  - Review the role on Ansible Galaxy
+  - Write a blog post reviewing the role
+  - Sponsor me.
+
+## Issue guidelines
+
+Issues are the best way to capture an bug in the role, or suggest new features.
+This is due to issues being visible to the entire community and allows for
+other contributors to pick up the work, so is a better communication medium
+than email.
+
+A good bug issue will include as much information as possible about the
+environment Ansible is running in, as well as the role configuration. If there
+are any relevant pieces of documentation from upstream projects, this should
+be included.
+
+New feature requests are also best captured in issues, these should include
+as much relevant information as possible and if possible include a "user story"
+(don't sweat if you don't know how to write one). If there are any relevant
+pieces of documentation from upstream projects, this should be included.
+
+## Pull request guidelines
+
+PRs should only contain 1 issue fix at a time to limit the scope of testing
+required. The smaller the scope of the PR, the easier it is for it to be
+reviewed.
+
+PRs should include the keyword `Fixes` before an issue number if the PR will
+completely close the issue. This is because automation will close the issue
+once the PR is merged.
+
+PRs are preferred to be merged in as a single commit, so rebasing before
+pushing is recommended, however this isn't a strict rule.