From 1bc2231a0d8312cc3ea994c6b73ab3138d666306 Mon Sep 17 00:00:00 2001
From: Carter <mckdev@amazon.com>
Date: Tue, 3 Sep 2024 12:24:13 -0700
Subject: [PATCH] admin: update bug report template (#1934)

---
 .github/ISSUE_TEMPLATE/bug-report.md               | 14 +++++---------
 .github/ISSUE_TEMPLATE/feature.md                  |  4 ++++
 .../{question.md => general-question.md}           |  3 +++
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename .github/ISSUE_TEMPLATE/{question.md => general-question.md} (96%)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index f05c8f356..a1bc9c10b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug Report
 about: Report a bug encountered using the EKS AMI
+title: 'bug($AREA): $HEADLINE'
+labels: bug
+assignees: ''
 
 ---
 
@@ -12,18 +15,11 @@ about: Report a bug encountered using the EKS AMI
 
 **How to reproduce it (as minimally and precisely as possible)**:
 
-**Anything else we need to know?**:
-
 **Environment**:
 - AWS Region:
 - Instance Type(s):
-- EKS Platform version (use `aws eks describe-cluster --name <name> --query cluster.platformVersion`):
-- Kubernetes version (use `aws eks describe-cluster --name <name> --query cluster.version`):
+- Cluster Kubernetes version:
+- Node Kubernetes version:
 - AMI Version:
-- Kernel (e.g. `uname -a`):
-- Release information (run `cat /etc/eks/release` on a node):
-<!-- Put release info in the triple backticks below-->
-```
-```
 
 <!-- If this is a security issue, please do not discuss on GitHub. Please report any suspected or confirmed security issues to AWS Security https://aws.amazon.com/security/vulnerability-reporting/ -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 9ff14e43a..bfed04955 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,8 +1,12 @@
 ---
 name: Feature Request
 about: Suggest a feature to the EKS AMI
+title: ''
+labels: ''
+assignees: ''
 
 ---
+
 <!-- Please only use this template for feature requests -->
 
 **What would you like to be added**:
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/general-question.md
similarity index 96%
rename from .github/ISSUE_TEMPLATE/question.md
rename to .github/ISSUE_TEMPLATE/general-question.md
index b66eef028..2442e2774 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/general-question.md
@@ -1,6 +1,9 @@
 ---
 name: General Question
 about: Any question relating to the EKS AMI
+title: ''
+labels: ''
+assignees: ''
 
 ---