Merge pull request hashicorp#589 from hashicorp/monorepo

Merge consul-helm into consul-k8s

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug Report
-about: You're experiencing an issue with the consul-k8s binary that is different than the documented behavior.
+about: You're experiencing an issue with the Consul Helm chart that is different than the documented behavior.
 labels: bug
 
 ---
@@ -25,22 +25,44 @@ labels: bug
 
 ### Reproduction Steps
 
-<!--- In order to effectively and quickly resolve the issue, please provide exact steps that allow us the reproduce the problem. If no steps are provided, then it will likely take longer to get the issue resolved.  --->
+<!--- 
+
+In order to effectively and quickly resolve the issue, please provide exact steps that allow us the reproduce the problem. If no steps are provided, then it will likely take longer to get the issue resolved. An example that you can follow is provided below. 
+
+Steps to reproduce this issue, eg:
+
+1. When running helm install with the following `values.yml`:
+```
+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-k8s or other components. 
+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>consul-k8s logs</summary>
+  <summary>Logs</summary>
 
 ```
-output from 'kubectl logs' in consul-k8s and/or other relevant components
+output from 'kubectl logs' in relevant components
 ```
 
 </details>
+
 --->
 
 ### Expected behavior
@@ -56,10 +78,15 @@ If not already included, please provide the following:
 - `consul-helm` version:
 - `values.yaml` used to deploy the helm chart:
 
-Any other information you can provide about the environment/deployment.
+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.
 --->
 
+
 ### Additional Context
 
 <!---

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Consul-Helm GitHub Issues
-    url: https://github.com/hashicorp/consul-helm/issues
-    about: Are you submitting an issue or feature enhancement for the Consul helm chart? Please create an issue in the consul-helm repository.
+  - name: Consul on Kubernetes GitHub Issues
+    url: https://github.com/hashicorp/consul-k8s/issues
+    about: Are you submitting an issue or feature enhancement for the consul-k8s binary? Please create an issue in the consul-k8s repository.
   - name: Consul on Kubernetes Learn Tutorials
     url: https://learn.hashicorp.com/collections/consul/kubernetes
     about: Please check out our Learn Tutorials. These hands on tutorials deal with many of the tasks common to using Consul on Kubernetes.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: If you have something you think Consul on Kubernetes could improve or add support for.
+about: If you have something you think Consul Helm could improve or add support for.
 labels: enhancement
 
 ---
@@ -27,7 +27,7 @@ labels: enhancement
 
 #### Use Case(s)
 
-<!--- Use cases where this feature is applicable for Consul on Kubernetes (i.e. type of application, type of Consul use case i.e. Service Mesh, Service Disovery) --->
+<!--- Use cases where this feature is applicable for Consul on Kubernetes (i.e. type of application, type of Consul use case i.e. Service Mesh, Service Disovery). --->
 
 #### Contributions
 

.github/ISSUE_TEMPLATE/question.md

@@ -9,7 +9,7 @@ Please search the existing issues for relevant questions, and use the reaction f
 #### Question
 
 Please provide as many details as you can, including but not limited to
-- consul-k8s command you're running
+- Helm command you're running
 - Any values you've configured
 - Your current understanding, and what you're trying to figure out
 

.github/pull_request_template.md

@@ -8,5 +8,6 @@ How I expect reviewers to test this PR:
 
 
 Checklist:
-- [ ] Tests added
+- [ ] Bats tests added
 - [ ] CHANGELOG entry added (*HashiCorp engineers only, community PRs should not add a changelog entry*)
+

.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
-/bin
-/pkg
+.terraform/
+.terraform.tfstate*
+terraform.tfstate*
+terraform.tfvars
+values.dev.yaml