Merge pull request volcano-sh#4 from asifdxtreme/cherrypick

[CHERRY-PICK] Added Queue Capability.
kevin-wangzefeng · May 6, 2019 · 245bec1 · 245bec1
2 parents 17c9edc + 5eec4c2
commit 245bec1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pkg/apis/scheduling/v1alpha1/types.go b/pkg/apis/scheduling/v1alpha1/types.go
@@ -204,7 +204,8 @@ type QueueStatus struct {
 
 // QueueSpec represents the template of Queue.
 type QueueSpec struct {
-	Weight int32 `json:"weight,omitempty" protobuf:"bytes,1,opt,name=weight"`
+	Weight     int32           `json:"weight,omitempty" protobuf:"bytes,1,opt,name=weight"`
+	Capability v1.ResourceList `json:"capability,omitempty" protobuf:"bytes,2,opt,name=capability"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/scheduler/util.go b/pkg/scheduler/util.go
@@ -21,7 +21,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf"
 	"github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework"