Merge pull request #661 from sivanzcw/bugfix

Change queue update in cli and e2e test to patch
volcano-sh · Jan 8, 2020 · 0998b6d · 0998b6d
2 parents 194c441 + 597aaf1
commit 0998b6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/pkg/cli/queue/operate.go b/pkg/cli/queue/operate.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 const (
@@ -84,14 +84,8 @@ func OperateQueue() error {
 		}
 
 		queueClient := versioned.NewForConfigOrDie(config)
-		queue, err := queueClient.SchedulingV1alpha2().Queues().Get(operateQueueFlags.Name, metav1.GetOptions{})
-		if err != nil {
-			return err
-		}
-
-		queue.Spec.Weight = int32(operateQueueFlags.Weight)
-
-		_, err = queueClient.SchedulingV1alpha2().Queues().Update(queue)
+		patchBytes := []byte(fmt.Sprintf(`{"spec":{"weight":%d}}`, operateQueueFlags.Weight))
+		_, err := queueClient.SchedulingV1alpha2().Queues().Patch(operateQueueFlags.Name, types.MergePatchType, patchBytes)
 
 		return err
 	case "":

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -229,14 +229,10 @@ func deleteQueues(cxt *context) {
 	foreground := metav1.DeletePropagationForeground
 
 	for _, q := range cxt.queues {
-		queue, err := cxt.vcclient.SchedulingV1alpha2().Queues().Get(q, metav1.GetOptions{})
+		patchBytes := []byte(fmt.Sprintf(`{"spec":{"state":"%s"}}`, schedulingv1alpha2.QueueStateClosed))
+		_, err := cxt.vcclient.SchedulingV1alpha2().Queues().Patch(q, types.MergePatchType, patchBytes)
 		Expect(err).NotTo(HaveOccurred())
-
-		queue.Spec.State = schedulingv1alpha2.QueueStateClosed
-		_, err = cxt.vcclient.SchedulingV1alpha2().Queues().Update(queue)
-		Expect(err).NotTo(HaveOccurred())
-
-		err = wait.Poll(100*time.Millisecond, oneMinute, queueClosed(cxt, queue.Name))
+		err = wait.Poll(100*time.Millisecond, oneMinute, queueClosed(cxt, q))
 		Expect(err).NotTo(HaveOccurred())
 
 		err = cxt.vcclient.SchedulingV1alpha2().Queues().Delete(q, &metav1.DeleteOptions{