Merge pull request #362 from hzxuzhonghu/cleanup

Some cleanups after kube-batch intree

Gopkg.toml

@@ -36,11 +36,6 @@ required = [
   branch = "master"
   name = "github.com/golang/glog"
 
-[[constraint]]
-  name = "github.com/kubernetes-sigs/kube-batch"
-  branch = "master"
-  source = "https://github.com/volcano-sh/scheduler"
-
 [[constraint]]
   name = "github.com/onsi/ginkgo"
   version = "1.7.0"
@@ -61,10 +56,6 @@ required = [
   name = "k8s.io/client-go"
   version = "10.0.0"
 
-[[constraint]]
-  branch = "master"
-  name = "k8s.io/gengo"
-
 [[constraint]]
   name = "k8s.io/kubernetes"
   version = "1.13.2"

docs/samples/kubecon-2019-china/scripts/node-info.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api"
+	"volcano.sh/volcano/pkg/scheduler/api"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

hack/generate-yaml.sh

@@ -67,7 +67,7 @@ fi
 cat ${VK_ROOT}/installer/namespace.yaml > ${DEPLOYMENT_FILE}
 ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespace volcano-system \
       --name volcano --set basic.image_tag_version=${VOLCANO_IMAGE_TAG} \
-      --set basic.scheduler_config_file=kube-batch-ci.conf \
+      --set basic.scheduler_config_file=volcano-scheduler.conf \
       -x templates/admission.yaml \
       -x templates/batch_v1alpha1_job.yaml \
       -x templates/bus_v1alpha1_command.yaml \

hack/lib/golang.sh

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 # The golang package that we are building.
-readonly KUBE_GO_PACKAGE=github.com/kubernetes-sigs/kube-batch
 readonly KUBE_GOPATH="${GOPATH}"
 
 # The set of server targets that we are only building for Linux

hack/run-e2e-kind.sh

@@ -38,7 +38,7 @@ function install-volcano {
   kind load docker-image ${MPI_EXAMPLE_IMAGE}  ${CLUSTER_CONTEXT}
 
   echo "Install volcano chart"
-  helm install installer/helm/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=kube-batch-ci.conf --wait
+  helm install installer/helm/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=volcano-scheduler-ci.conf --wait
 }
 
 function uninstall-volcano {
@@ -51,7 +51,7 @@ function generate-log {
     echo "Generating volcano log files"
     kubectl logs deployment/${CLUSTER_NAME}-admission -n kube-system > volcano-admission.log
     kubectl logs deployment/${CLUSTER_NAME}-controllers -n kube-system > volcano-controller.log
-    kubectl logs deployment/${CLUSTER_NAME}-scheduler -n kube-system > volcano-kube-batch.log
+    kubectl logs deployment/${CLUSTER_NAME}-scheduler -n kube-system > volcano-scheduler.log
 
 }
 

installer/README.md

@@ -77,7 +77,7 @@ The following are the list configurable parameters of Volcano Chart and their de
 |`basic.scheduler_image_name`|Scheduler Docker Image Name|`volcanosh/vc-scheduler`|
 |`basic.admission_image_name`|Admission Controller Image Name|`volcanosh/vc-admission`|
 |`basic.admission_secret_name`|Volcano Admission Secret Name|`volcano-admission-secret`|
-|`basic.scheduler_config_file`|Configuration File name for Scheduler|`kube-batch.conf`|
+|`basic.scheduler_config_file`|Configuration File name for Scheduler|`volcano-scheduler.conf`|
 |`basic.image_pull_secret`|Image Pull Secret|`""`|
 |`basic.image_pull_policy`|Image Pull Policy|`IfNotPresent`|
 |`basic.admission_app_name`|Admission Controller App Name|`volcano-admission`|

installer/helm/chart/volcano/values.yaml

@@ -4,5 +4,5 @@ basic:
   scheduler_image_name: "volcanosh/vc-scheduler"
   admission_image_name: "volcanosh/vc-admission"
   admission_secret_name: "volcano-admission-secret"
-  scheduler_config_file: "kube-batch.conf"
+  scheduler_config_file: "volcano-scheduler.conf"
   image_pull_secret: ""

installer/volcano-development.yaml

@@ -10,7 +10,7 @@ metadata:
   name: volcano-scheduler-configmap
   namespace: volcano-system
 data:
-  kube-batch-ci.conf: |
+  volcano-scheduler-ci.conf: |
     actions: "enqueue, reclaim, allocate, backfill, preempt"
     tiers:
     - plugins:
@@ -22,7 +22,7 @@ data:
       - name: predicates
       - name: proportion
       - name: nodeorder
-  kube-batch.conf: |
+  volcano-scheduler.conf: |
     actions: "enqueue, allocate, backfill"
     tiers:
     - plugins:
@@ -140,7 +140,7 @@ spec:
           image: volcanosh/vc-scheduler:latest
           args:
             - --alsologtostderr
-            - --scheduler-conf=/volcano.scheduler/kube-batch-ci.conf
+            - --scheduler-conf=/volcano.scheduler/volcano-scheduler-ci.conf
             - -v=3
             - 2>&1
           imagePullPolicy: "IfNotPresent"

pkg/admission/admit_job.go

@@ -36,7 +36,7 @@ import (
 	"volcano.sh/volcano/pkg/controllers/job/plugins"
 )
 
-//KubeBatchClientSet is kube-batch clientset
+// KubeBatchClientSet is volcano clientset
 var KubeBatchClientSet versioned.Interface
 
 // AdmitJobs is to admit jobs and return response

pkg/admission/admit_job_test.go

@@ -951,7 +951,7 @@ func TestValidateExecution(t *testing.T) {
 				Weight: 1,
 			},
 		}
-		// create fake kube-batch clientset
+		// create fake volcano clientset
 		KubeBatchClientSet = kubebatchclient.NewSimpleClientset()
 
 		//create default queue

pkg/scheduler/cache/event_handlers.go

@@ -40,7 +40,7 @@ func isTerminated(status kbapi.TaskStatus) bool {
 }
 
 // getOrCreateJob will return corresponding Job for pi if it exists, or it will create a Job and return it if
-// pi.Pod.Spec.SchedulerName is same as kube-batch scheduler's name, otherwise it will return nil.
+// pi.Pod.Spec.SchedulerName is same as volcano scheduler's name, otherwise it will return nil.
 func (sc *SchedulerCache) getOrCreateJob(pi *kbapi.TaskInfo) *kbapi.JobInfo {
 	if len(pi.Job) == 0 {
 		if pi.Pod.Spec.SchedulerName != sc.schedulerName {