Merge branch 'main' into collector-name-task

Author: laverya

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +1,19 @@
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-
-1. If this is your first time, please read our contributor guidelines here:
-https://github.com/replicatedhq/kots/blob/main/CONTRIBUTING.md.
-2. Ensure you have added appropriate tests for your PR. For more information read here:
-https://github.com/replicatedhq/kots/blob/main/CONTRIBUTING.md#testing
-3. If the PR is unfinished, please mark it as a draft.
--->
-
 #### What this PR does / why we need it:
-
-#### Which issue(s) this PR fixes:
 <!--
-*Automatically closes linked issue when PR is merged.
-Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+Describe the purpose of this change and the problem it solves.
 -->
-Fixes #
 
-#### Special notes for your reviewer:
+#### Which issue(s) this PR fixes:
 <!--
-Any additional special notes for your reviewer.
+Link to the Shortcut story or Github issue this PR fixes.
 -->
 
-## Steps to reproduce
+#### Does this PR require a test?
 <!---
-Please provide minimum instructions for how someone can view/test/verify your changes.
+If no, just write "NONE" below.
 -->
 
-#### Does this PR introduce a user-facing change?
+#### Does this PR require a release note?
 <!--
 If no, just write "NONE" in the release-note block below.
 If yes, a release note is required:
@@ -38,5 +25,5 @@ If yes, a release note is required:
 #### Does this PR require documentation?
 <!--
 If no, just write "NONE" below.
-If yes, link to the related https://github.com/replicatedhq/kots.io documentation PR:
+If yes, link to the related https://github.com/replicatedhq/replicated-docs documentation PR:
 -->