Merge pull request volcano-sh#325 from k82cn/add_queue

Add queue

Makefile

@@ -16,7 +16,7 @@ init:
 
 generate-code:
 	go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
-	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/core/v1alpha1/ -O zz_generated.deepcopy
+	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/scheduling/v1alpha1/ -O zz_generated.deepcopy
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/extensions/v1alpha1/ -O zz_generated.deepcopy
 
 images: kube-arbitrator

cmd/kar-controllers/app/server.go

@@ -38,6 +38,7 @@ import (
 
 	"github.com/kubernetes-incubator/kube-arbitrator/cmd/kar-controllers/app/options"
 	"github.com/kubernetes-incubator/kube-arbitrator/pkg/controller/job"
+	"github.com/kubernetes-incubator/kube-arbitrator/pkg/controller/queue"
 )
 
 const (
@@ -62,9 +63,11 @@ func Run(opt *options.ServerOption) error {
 	neverStop := make(chan struct{})
 
 	queuejobctrl := job.NewController(config)
+	queueController := queue.NewController(config)
 
 	run := func(stopCh <-chan struct{}) {
 		queuejobctrl.Run(stopCh)
+		queueController.Run(stopCh)
 		<-stopCh
 	}
 

config/crds/core_v1alpha1_podgroup.yaml → config/crds/scheduling_v1alpha1_podgroup.yaml

@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: podgroups.core.arbitrator.incubator.k8s.io
+  name: podgroups.scheduling.arbitrator.incubator.k8s.io
 spec:
-  group: core.arbitrator.incubator.k8s.io
+  group: scheduling.arbitrator.incubator.k8s.io
   names:
     kind: PodGroup
     plural: podgroups

config/crds/scheduling_v1alpha1_queue.yaml

@@ -0,0 +1,27 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: queues.scheduling.arbitrator.incubator.k8s.io
+spec:
+  group: scheduling.arbitrator.incubator.k8s.io
+  names:
+    kind: Queue
+    plural: Queues
+  scope: Cluster
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            weight:
+              format: int32
+              type: integer
+          type: object
+      type: object
+  version: v1alpha1

hack/.golint_failures

@@ -2,10 +2,11 @@ cmd/kar-controllers/app
 cmd/kar-controllers/app/options
 cmd/kar-scheduler/app
 cmd/kar-scheduler/app/options
-pkg/apis/core/v1alpha1
 pkg/apis/extensions/v1alpha1
+pkg/apis/scheduling/v1alpha1
 pkg/apis/utils
 pkg/controller/job
+pkg/controller/queue
 pkg/karcli/job
 pkg/scheduler
 pkg/scheduler/actions/allocate

hack/boilerplate/boilerplate.go.txt

@@ -1,5 +1,5 @@
 /*
-Copyright YEAR The Kubernetes Authors.
+Copyright 2018 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

hack/run-e2e.sh

@@ -5,7 +5,7 @@ export PATH="${HOME}/.kubeadm-dind-cluster:${PATH}"
 # start k8s dind cluster
 APISERVER_enable_admission_plugins=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Priority,ResourceQuota ./hack/dind-cluster-v1.11.sh up
 
-kubectl create -f config/crds/core_v1alpha1_podgroup.yaml
+kubectl create -f config/crds/scheduling_v1alpha1_podgroup.yaml
 kubectl create -f config/crds/extensions_v1alpha1_job.yaml
 
 # start kube-arbitrator

pkg/apis/core/v1alpha1/register.go → pkg/apis/scheduling/v1alpha1/register.go

@@ -28,7 +28,7 @@ var (
 )
 
 // GroupName is the group name used in this package.
-const GroupName = "core.arbitrator.incubator.k8s.io"
+const GroupName = "scheduling.arbitrator.incubator.k8s.io"
 
 // SchemeGroupVersion is the group version used to register these objects.
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}

pkg/apis/core/v1alpha1/types.go → pkg/apis/scheduling/v1alpha1/types.go

@@ -107,3 +107,40 @@ type PodGroupList struct {
 	// items is the list of PodGroup
 	Items []PodGroup `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
+
+// +genclient
+// +genclient:nonNamespaced
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Queue is a queue of PodGroup.
+type Queue struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard object's metadata.
+	// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
+	// Specification of the desired behavior of the pod group.
+	// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status
+	// +optional
+	Spec QueueSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
+}
+
+// QueueSpec represents the template of Queue.
+type QueueSpec struct {
+	Weight int32 `json:"weight,omitempty" protobuf:"bytes,1,opt,name=weight"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// QueueList is a collection of queues.
+type QueueList struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard list metadata
+	// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
+	// items is the list of PodGroup
+	Items []PodGroup `json:"items" protobuf:"bytes,2,rep,name=items"`
+}