From 942f1983edbde7563d117e9d92baea2fef1e15b9 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Thu, 9 May 2019 18:03:38 +0800
Subject: [PATCH] fix

---
 installer/chart/volcano/templates/controllers.yaml        | 4 ++--
 .../volcano/templates/scheduling_v1alpha1_queue.yaml      | 8 ++++++++
 pkg/controllers/queue/queue_controller.go                 | 2 +-
 test/e2e/queue.go                                         | 6 ++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/installer/chart/volcano/templates/controllers.yaml b/installer/chart/volcano/templates/controllers.yaml
index 8e6c25c4e9..dcc6357597 100644
--- a/installer/chart/volcano/templates/controllers.yaml
+++ b/installer/chart/volcano/templates/controllers.yaml
@@ -39,8 +39,8 @@ rules:
     resources: ["services", "configmaps"]
     verbs: ["get", "list", "watch", "create", "delete"]
   - apiGroups: ["scheduling.incubator.k8s.io"]
-    resources: ["podgroups", "queues"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    resources: ["podgroups", "queues", "queues/status"]
+    verbs: ["get", "list", "watch", "create", "delete", "update"]
   - apiGroups: ["scheduling.k8s.io"]
     resources: ["priorityclasses"]
     verbs: ["get", "list", "watch", "create", "delete"]
diff --git a/installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml b/installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
index ae80ccf2b3..46bc0ade69 100644
--- a/installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
+++ b/installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
@@ -27,3 +27,11 @@ spec:
           type: object
       type: object
   version: v1alpha1
+  subresources:
+    status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/pkg/controllers/queue/queue_controller.go b/pkg/controllers/queue/queue_controller.go
index ecf926f045..0bc2bce910 100644
--- a/pkg/controllers/queue/queue_controller.go
+++ b/pkg/controllers/queue/queue_controller.go
@@ -147,7 +147,7 @@ func (c *Controller) syncQueue(key string) error {
 		glog.V(2).Infoln("queue %s has not been seen or deleted", key)
 		return nil
 	}
-	podGroups := make([]string, len(c.podGroups[key]))
+	podGroups := make([]string, 0, len(c.podGroups[key]))
 	for pgKey := range c.podGroups[key] {
 		podGroups = append(podGroups, pgKey)
 	}
diff --git a/test/e2e/queue.go b/test/e2e/queue.go
index 6183638293..038a70b0e6 100644
--- a/test/e2e/queue.go
+++ b/test/e2e/queue.go
@@ -70,7 +70,7 @@ var _ = Describe("Queue E2E Test", func() {
 
 		// Test Queue status
 		spec = &jobSpec{
-			name:  "",
+			name:  "q1-qj-2",
 			queue: defaultQueue1,
 			tasks: []taskSpec{
 				{
@@ -81,7 +81,9 @@ var _ = Describe("Queue E2E Test", func() {
 				},
 			},
 		}
-
+		job3 := createJob(context, spec)
+		err = waitJobStatePending(context, job3)
+		Expect(err).NotTo(HaveOccurred())
 		err = waitQueueStatus(func() (bool, error) {
 			queue, err := context.kbclient.SchedulingV1alpha1().Queues().Get(defaultQueue1, metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())