From 63a8dee60ddd24523b9cd35057cc9049fd8197f7 Mon Sep 17 00:00:00 2001
From: Eric Hotinger <ehotinger@gmail.com>
Date: Wed, 19 Jun 2019 12:23:38 -0700
Subject: [PATCH] Switch to GitHub's new issue templates.

Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
---
 .../bug_report.md}                            | 21 +++++++++----------
 .github/ISSUE_TEMPLATE/feature_request.md     | 16 ++++++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)
 rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/bug_report.md} (50%)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 50%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 2cfdef0a4..0d67a50e6 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,19 +1,16 @@
+---
+name: Bug report
+about: Create a bug report to help improve containerd
+title: ''
+labels: kind/bug
+assignees: ''
+---
+
 <!--
 If you are reporting a new issue, make sure that we do not have any duplicates
 already open. You can ensure this by searching the issue list for this
 repository. If there is a duplicate, please close your issue and add a comment
 to the existing issue instead.
-
-If you suspect your issue is a bug, please edit your issue description to
-include the BUG REPORT INFORMATION shown below. If you fail to provide this
-information within 7 days, we cannot debug your issue and will close it. We
-will, however, reopen it if you later provide the information.
-
----------------------------------------------------
-BUG REPORT INFORMATION
----------------------------------------------------
-Use the commands below to provide key information from your environment:
-You do NOT have to include this information if this is a FEATURE REQUEST
 -->
 
 **Description**
@@ -38,3 +35,5 @@ Briefly describe the problem you are having in a few paragraphs.
 ```
 (paste your output here)
 ```
+
+**Any other relevant information:**
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..e123919e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for containerd
+title: ''
+labels: kind/feature
+assignees: ''
+---
+
+**What is the problem you're trying to solve**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you'd like to happen.
+
+**Additional context**
+Add any other context about the feature request here.
\ No newline at end of file