Skip to content

Commit eb87bc8

Browse files
committed
Fix default queue not existing error
1 parent 689805b commit eb87bc8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

hack/run-e2e.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ kubectl create -f hack/e2e-admission-config.yaml
2626
nohup ${VK_BIN}/vk-controllers --kubeconfig ${HOME}/.kube/config --master=${MASTER} --logtostderr --v ${LOG_LEVEL} > controller.log 2>&1 &
2727

2828
# start scheduler
29-
nohup ${VK_BIN}/vk-scheduler --kubeconfig ${HOME}/.kube/config --scheduler-conf=example/kube-batch-conf.yaml --master=${MASTER} --logtostderr --v ${LOG_LEVEL} > scheduler.log 2>&1 &
29+
# NOTE(tommylikehu): Now we set default batch queue to 'test', it's SHOULD be updated once it's come to
30+
# a conclusion how to handle the queue either in kube batch or volcano.
31+
nohup ${VK_BIN}/vk-scheduler --kubeconfig ${HOME}/.kube/config --scheduler-conf=example/kube-batch-conf.yaml --master=${MASTER} --default-queue test --logtostderr --v ${LOG_LEVEL} > scheduler.log 2>&1 &
3032

3133
# start admission-controller
3234
nohup ${VK_BIN}/vk-admission --tls-cert-file=${CERT_PATH}/apiserver.crt --tls-private-key-file=${CERT_PATH}/apiserver.key --kubeconfig ${HOME}/.kube/config --port ${HOSTPORT} --logtostderr --v ${LOG_LEVEL} > admission.log 2>&1 &

test/e2e/util.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"fmt"
2222
"os"
2323
"path/filepath"
24-
"strconv"
2524
"strings"
2625
"time"
2726

@@ -105,7 +104,7 @@ type context struct {
105104
}
106105

107106
func initTestContext() *context {
108-
enableNamespaceAsQueue, _ := strconv.ParseBool(os.Getenv("ENABLE_NAMESPACES_AS_QUEUE"))
107+
//enableNamespaceAsQueue, _ := strconv.ParseBool(os.Getenv("ENABLE_NAMESPACES_AS_QUEUE"))
109108
cxt := &context{
110109
namespace: "test",
111110
queues: []string{"q1", "q2"},
@@ -130,7 +129,9 @@ func initTestContext() *context {
130129
Expect(err).NotTo(HaveOccurred(),
131130
"k8s cluster is required to have one ready worker node at least.")
132131

133-
cxt.enableNamespaceAsQueue = enableNamespaceAsQueue
132+
//NOTE(tommylikehu):NamespaceAsQueue feature was removed from kube-batch,
133+
//we will eventually remove this logic in test as well.
134+
cxt.enableNamespaceAsQueue = false
134135

135136
_, err = cxt.kubeclient.CoreV1().Namespaces().Create(&v1.Namespace{
136137
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)