File tree 2 files changed +7
-4
lines changed
2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,9 @@ kubectl create -f hack/e2e-admission-config.yaml
26
26
nohup ${VK_BIN} /vk-controllers --kubeconfig ${HOME} /.kube/config --master=${MASTER} --logtostderr --v ${LOG_LEVEL} > controller.log 2>&1 &
27
27
28
28
# 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 &
30
32
31
33
# start admission-controller
32
34
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 &
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ import (
21
21
"fmt"
22
22
"os"
23
23
"path/filepath"
24
- "strconv"
25
24
"strings"
26
25
"time"
27
26
@@ -105,7 +104,7 @@ type context struct {
105
104
}
106
105
107
106
func initTestContext () * context {
108
- enableNamespaceAsQueue , _ := strconv .ParseBool (os .Getenv ("ENABLE_NAMESPACES_AS_QUEUE" ))
107
+ // enableNamespaceAsQueue, _ := strconv.ParseBool(os.Getenv("ENABLE_NAMESPACES_AS_QUEUE"))
109
108
cxt := & context {
110
109
namespace : "test" ,
111
110
queues : []string {"q1" , "q2" },
@@ -130,7 +129,9 @@ func initTestContext() *context {
130
129
Expect (err ).NotTo (HaveOccurred (),
131
130
"k8s cluster is required to have one ready worker node at least." )
132
131
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
134
135
135
136
_ , err = cxt .kubeclient .CoreV1 ().Namespaces ().Create (& v1.Namespace {
136
137
ObjectMeta : metav1.ObjectMeta {
You can’t perform that action at this time.
0 commit comments