From 25a46e97de2a1606fe671c9d8cabc2a54b43920d Mon Sep 17 00:00:00 2001
From: Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
Date: Mon, 18 Mar 2019 10:46:57 +0800
Subject: [PATCH 1/4] Add issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..903dc74aa9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a Bug to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- This form is for bug reports and feature requests ONLY!
+
+If you're looking for help check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes) and the [troubleshooting guide](https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/).
+
+If the matter is security related, please disclose it privately via https://kubernetes.io/security/.
+-->
+
+**Is this a BUG REPORT or FEATURE REQUEST?**:
+
+> Uncomment only one, leave it on its own line:
+>
+> /kind bug
+> /kind feature
+
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Kubernetes version (use `kubectl version`):
+- Cloud provider or hardware configuration:
+- OS (e.g. from /etc/os-release):
+- Kernel (e.g. `uname -a`):
+- Install tools:
+- Others:

From 7d8d4db4d288060fd855ea00988950c0861bc56c Mon Sep 17 00:00:00 2001
From: Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
Date: Mon, 18 Mar 2019 11:14:35 +0800
Subject: [PATCH 2/4] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 903dc74aa9..83eb4a8831 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,9 +9,7 @@ assignees: ''
 
 <!-- This form is for bug reports and feature requests ONLY!
 
-If you're looking for help check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes) and the [troubleshooting guide](https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/).
-
-If the matter is security related, please disclose it privately via https://kubernetes.io/security/.
+If you're looking for a help then check our [Slack Channel](http://volcano-sh.slack.com/) or have a look at our [dev mailing](https://groups.google.com/forum/#!forum/volcano-sh) 
 -->
 
 **Is this a BUG REPORT or FEATURE REQUEST?**:

From 446fad93e1c75d2f1c32d894701e094f946a35a5 Mon Sep 17 00:00:00 2001
From: Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
Date: Mon, 18 Mar 2019 11:40:31 +0800
Subject: [PATCH 3/4] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 83eb4a8831..630b306ddf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -30,6 +30,7 @@ If you're looking for a help then check our [Slack Channel](http://volcano-sh.sl
 **Anything else we need to know?**:
 
 **Environment**:
+- Volcano Version:
 - Kubernetes version (use `kubectl version`):
 - Cloud provider or hardware configuration:
 - OS (e.g. from /etc/os-release):

From f49b4c01a41d43c53a7fb92f82787ddee430992f Mon Sep 17 00:00:00 2001
From: Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
Date: Mon, 18 Mar 2019 16:53:16 +0800
Subject: [PATCH 4/4] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 630b306ddf..326b1c15d7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
-name: Bug report
-about: Create a Bug to help us improve
+name: Bug Report or Feature Request
+about: Create a Bug/Feature to help us improve
 title: ''
 labels: ''
 assignees: ''