diff --git a/Gopkg.lock b/Gopkg.lock index 105ed545e29..60dff4092ab 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -204,7 +204,7 @@ [[projects]] branch = "master" - digest = "1:373e831b25d35980629d8042cf8941f1455cee70e846e2c91064ecb074ce3826" + digest = "1:986c933d3d3c05ab20d42462475be937ee26238500e58f5b53b5ae77b60f49ad" name = "github.com/kubernetes-sigs/kube-batch" packages = [ "cmd/kube-batch/app", @@ -245,7 +245,7 @@ "pkg/version", ] pruneopts = "UT" - revision = "2e229b9ef61ca616735b667beb77a01fac2bb5f1" + revision = "2a63a4754d8289bf6491b7320ab6d832c75767ce" source = "https://github.com/volcano-sh/kube-batch" [[projects]] diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/types.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/types.go index 6670498812d..3db451df07b 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/types.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/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/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go index d0b60967f9d..ec5461b13a4 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go @@ -159,7 +159,7 @@ func (in *Queue) DeepCopyInto(out *Queue) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) out.Status = in.Status return } @@ -218,6 +218,13 @@ func (in *QueueList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *QueueSpec) DeepCopyInto(out *QueueSpec) { *out = *in + if in.Capability != nil { + in, out := &in.Capability, &out.Capability + *out = make(v1.ResourceList, len(*in)) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } return } diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util.go index bcfc84753a5..ed6d78cc0f0 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/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"