fix

volcano-sh · May 9, 2019 · 942f198 · 942f198
1 parent f2a91f7
commit 942f198
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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())