Merge pull request volcano-sh#32 from lminzhw/scheduler_name

change SchedulerName kube-batch to volcano
kevin-wangzefeng · Jun 24, 2019 · ab057d3 · ab057d3
2 parents 80388d2 + bd2b465
commit ab057d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cmd/kube-batch/app/options/options.go b/cmd/kube-batch/app/options/options.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	defaultSchedulerName   = "kube-batch"
+	defaultSchedulerName   = "volcano"
 	defaultSchedulerPeriod = time.Second
 	defaultQueue           = "default"
 	defaultListenAddress   = ":8080"

diff --git a/pkg/cli/queue/common.go b/pkg/cli/queue/common.go
@@ -29,7 +29,7 @@ type commonFlags struct {
 }
 
 func initFlags(cmd *cobra.Command, cf *commonFlags) {
-	cmd.Flags().StringVarP(&cf.SchedulerName, "scheduler", "", "kube-batch", "the scheduler for this job")
+	cmd.Flags().StringVarP(&cf.SchedulerName, "scheduler", "", "volcano", "the scheduler for this job")
 	cmd.Flags().StringVarP(&cf.Master, "master", "s", "", "the address of apiserver")
 
 	if home := homeDir(); home != "" {

diff --git a/pkg/scheduler/cache/cache_test.go b/pkg/scheduler/cache/cache_test.go
@@ -269,7 +269,7 @@ func TestGetOrCreateJob(t *testing.T) {
 
 	pod2 := buildPod("c1", "p2", "n1", v1.PodRunning, buildResourceList("1000m", "1G"),
 		[]metav1.OwnerReference{owner2}, make(map[string]string))
-	pod2.Spec.SchedulerName = "kube-batch"
+	pod2.Spec.SchedulerName = "volcano"
 	pi2 := api.NewTaskInfo(pod2)
 
 	pod3 := buildPod("c3", "p3", "n1", v1.PodRunning, buildResourceList("1000m", "1G"),
@@ -279,7 +279,7 @@ func TestGetOrCreateJob(t *testing.T) {
 	cache := &SchedulerCache{
 		Nodes:         make(map[string]*api.NodeInfo),
 		Jobs:          make(map[api.JobID]*api.JobInfo),
-		schedulerName: "kube-batch",
+		schedulerName: "volcano",
 	}
 
 	tests := []struct {

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -310,7 +310,7 @@ func createJob(context *context, job *jobSpec) ([]*batchv1.Job, *kbv1.PodGroup)
 						Annotations: map[string]string{kbv1.GroupNameAnnotationKey: job.name},
 					},
 					Spec: v1.PodSpec{
-						SchedulerName: "kube-batch",
+						SchedulerName: "volcano",
 						RestartPolicy: v1.RestartPolicyOnFailure,
 						Containers:    createContainers(task.img, task.req, task.hostport),
 						Affinity:      task.affinity,
@@ -530,7 +530,7 @@ func createReplicaSet(context *context, name string, rep int32, img string, req
 					Labels: map[string]string{deploymentName: name},
 				},
 				Spec: v1.PodSpec{
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 					RestartPolicy: v1.RestartPolicyAlways,
 					Containers: []v1.Container{
 						{
@@ -999,7 +999,7 @@ func createDensityJob(context *context, job *jobSpec) ([]*batchv1.Job, *kbv1.Pod
 						Annotations: map[string]string{kbv1.GroupNameAnnotationKey: job.name},
 					},
 					Spec: v1.PodSpec{
-						SchedulerName: "kube-batch",
+						SchedulerName: "volcano",
 						RestartPolicy: v1.RestartPolicyOnFailure,
 						Containers:    createContainers(task.img, task.req, task.hostport),
 						Affinity:      task.affinity,
@@ -1061,7 +1061,7 @@ func createRunningPodFromRC(wg *sync.WaitGroup, context *context, name, image, p
 						},
 					},
 					DNSPolicy:     v1.DNSDefault,
-					SchedulerName: "kube-batch",
+					SchedulerName: "volcano",
 				},
 			},
 		},