Merge remote-tracking branch 'origin/main' into inject-volume-mount

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug Report
-about: You're experiencing an issue with the Consul Helm chart or consul-k8s-control-plane binary that is different than the documented behavior.
-labels: bug
+about: You're experiencing an issue with the Consul Helm chart, consul-k8s CLI, or consul-k8s-control-plane binary that is different than the documented behavior.
+labels: type/bug
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: If you have something you think Consul on Kubernetes could improve or add support for.
-labels: enhancement
+labels: type/enhancement
 
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -1,18 +1,101 @@
 ---
 name: Question
-about: If you have a question.
-labels: question
+about: You'd like to clarify your understanding about a particular area within Consul on Kubernetes. We'd like to help and engage the community through Github!
+labels: type/question
 
 ---
-Please search the existing issues for relevant questions, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing questions.
+
+<!--
+You've selected this issue type since you'd like to clarify your understanding about a particular area within Consul K8s. There are situations when an issue or feature request does not really classify the type of help you are requesting from the Consul K8s team. We'd like to help and engage the community through Github!
+-->
 
 #### Question
 
-Please provide as many details as you can, including but not limited to
-- Helm command you're running
-- consul-k8s-control-plane command you're running
-- Any helm values you've configured
-- Your current understanding, and what you're trying to figure out
+<!--
+
+Provide a clear description of the question you would like answered with as much detail as you can provide (links to docs, gists of commands). If you are reporting a feature request or issue, please use the other issue types instead. If appropriate, please use the sections below for providing more details around your configuration, CLI commands, logs, and environment details!
+
+Please search the existing issues for relevant questions, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing questions.
+
+More details will help us answer questions more accurately and with less delay :) 
+-->
+
+### CLI Commands (consul-k8s, consul-k8s-control-plane, helm)
+
+<!--
+
+Provide any relevant CLI commands and output from those commands that could help understand what you've attempted so far.
+
+```
+consul-k8s install 
+```
+
+-->
+
+### Helm Configuration
+
+<!--- 
+
+In order to effectively understand and answer your question, please provide exact steps that allow us the reproduce the problem. If no steps are provided, then it will likely take longer to get your question answered. An example that you can follow is provided below. 
+
+Steps to reproduce this issue, eg:
+
+1. When running helm install with the following `values.yaml`:
+```
+global:
+  domain: consul
+  datacenter: dc1
+server:
+  replicas: 1
+  bootstrapExpect: 1
+connectInject:
+  enabled: true
+controller:
+  enabled: true
+```
+1. View error
+
+  --->
+
+### Logs
+
+<!---
+
+Provide log files from Consul Kubernetes components by providing output from `kubectl logs` from the pod and container that is surfacing the issue. 
+
+<details>
+  <summary>Logs</summary>
+
+```
+output from 'kubectl logs' in relevant components
+```
+
+</details>
+
+--->
+
+### Current understanding and Expected behavior
+
+<!--- What is you current understanding of what is supposed to happen? What was the expected result after utilizing the commmands config you provided?  --->
+
+### Environment details
+
+<!---
+
+If not already included, please provide the following:
+- `consul-k8s` version:
+- `values.yaml` used to deploy the helm chart:
+
+Additionally, please provide details regarding the Kubernetes Infrastructure, as shown below:
+- Kubernetes version: v1.22.x
+- Cloud Provider (If self-hosted, the Kubernetes provider utilized): EKS, AKS, GKE, OpenShift (and version), Rancher (and version), TKGI (and version)
+- Networking CNI plugin in use: Calico, Cilium, NSX-T 
+
+Any other information you can provide about the environment/deployment.
+--->
 
-More details will help us answer questions more accurately and with less delay :)
+### Additional Context
 
+<!---
+Additional context on the problem. Docs, links to blogs, or other material that lead you to discover this issue or were helpful in troubleshooting the issue. 
+--->

.github/pull_request_template.md

@@ -9,5 +9,7 @@ How I expect reviewers to test this PR:
 
 Checklist:
 - [ ] Tests added
-- [ ] CHANGELOG entry added (*HashiCorp engineers only, community PRs should not add a changelog entry*)
+- [ ] CHANGELOG entry added 
+  > HashiCorp engineers only, community PRs should not add a changelog entry.
+  > Entries should use present tense (e.g. Add support for...)