Skip to content

Commit 597aaf1

Browse files
committed
change queue update in cli and e2e test to patch
1 parent 194c441 commit 597aaf1

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

pkg/cli/queue/operate.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/spf13/cobra"
2626

27-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27+
"k8s.io/apimachinery/pkg/types"
2828
)
2929

3030
const (
@@ -84,14 +84,8 @@ func OperateQueue() error {
8484
}
8585

8686
queueClient := versioned.NewForConfigOrDie(config)
87-
queue, err := queueClient.SchedulingV1alpha2().Queues().Get(operateQueueFlags.Name, metav1.GetOptions{})
88-
if err != nil {
89-
return err
90-
}
91-
92-
queue.Spec.Weight = int32(operateQueueFlags.Weight)
93-
94-
_, err = queueClient.SchedulingV1alpha2().Queues().Update(queue)
87+
patchBytes := []byte(fmt.Sprintf(`{"spec":{"weight":%d}}`, operateQueueFlags.Weight))
88+
_, err := queueClient.SchedulingV1alpha2().Queues().Patch(operateQueueFlags.Name, types.MergePatchType, patchBytes)
9589

9690
return err
9791
case "":

test/e2e/util.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,10 @@ func deleteQueues(cxt *context) {
229229
foreground := metav1.DeletePropagationForeground
230230

231231
for _, q := range cxt.queues {
232-
queue, err := cxt.vcclient.SchedulingV1alpha2().Queues().Get(q, metav1.GetOptions{})
232+
patchBytes := []byte(fmt.Sprintf(`{"spec":{"state":"%s"}}`, schedulingv1alpha2.QueueStateClosed))
233+
_, err := cxt.vcclient.SchedulingV1alpha2().Queues().Patch(q, types.MergePatchType, patchBytes)
233234
Expect(err).NotTo(HaveOccurred())
234-
235-
queue.Spec.State = schedulingv1alpha2.QueueStateClosed
236-
_, err = cxt.vcclient.SchedulingV1alpha2().Queues().Update(queue)
237-
Expect(err).NotTo(HaveOccurred())
238-
239-
err = wait.Poll(100*time.Millisecond, oneMinute, queueClosed(cxt, queue.Name))
235+
err = wait.Poll(100*time.Millisecond, oneMinute, queueClosed(cxt, q))
240236
Expect(err).NotTo(HaveOccurred())
241237

242238
err = cxt.vcclient.SchedulingV1alpha2().Queues().Delete(q, &metav1.DeleteOptions{

0 commit comments

Comments
 (0)