From b73fa1838568792b243111f0ae2138dd44c020d9 Mon Sep 17 00:00:00 2001 From: "Da K. Ma" Date: Sun, 12 Aug 2018 15:16:48 +0800 Subject: [PATCH 1/2] Enabled admission plugins. Signed-off-by: Da K. Ma --- hack/e2e-cluster.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 hack/e2e-cluster.sh diff --git a/hack/e2e-cluster.sh b/hack/e2e-cluster.sh new file mode 100755 index 0000000000..fb7e80bab9 --- /dev/null +++ b/hack/e2e-cluster.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +APISERVER_enable_admission_plugins=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Priority,ResourceQuota ./hack/dind-cluster-v1.11.sh up + +kc=$(which kubectl) + +if [ -z ${kc} ]; then + curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl + + chmod +x ./kubectl + + kc=./kubectl +fi + +${kc} config set-cluster dind --server=http://localhost:8080 --insecure-skip-tls-verify +${kc} config set-context dind --cluster=dind --namespace=default +${kc} config set current-context dind + +${kc} create -f config/crds/core_v1alpha1_podgroup.yaml +${kc} create -f config/crds/extensions_v1alpha1_job.yaml + +killall -9 kar-controllers kar-scheduler + +nohup _output/bin/kar-controllers --master localhost:8080 --logtostderr --v 3 > controller.log 2>&1 & +nohup _output/bin/kar-scheduler --master localhost:8080 --logtostderr --v 3 > scheduler.log 2>&1 & + From c7ae8bc42d996beeac82788dc868d7f47b438558 Mon Sep 17 00:00:00 2001 From: "Da K. Ma" Date: Mon, 13 Aug 2018 12:25:21 +0800 Subject: [PATCH 2/2] Added Queue. Signed-off-by: Da K. Ma --- Makefile | 2 +- cmd/kar-controllers/app/server.go | 3 + ...yaml => scheduling_v1alpha1_podgroup.yaml} | 4 +- config/crds/scheduling_v1alpha1_queue.yaml | 27 +++ hack/.golint_failures | 3 +- hack/boilerplate/boilerplate.go.txt | 2 +- hack/e2e-cluster.sh | 26 --- hack/run-e2e.sh | 2 +- pkg/apis/{core => scheduling}/v1alpha1/doc.go | 0 .../{core => scheduling}/v1alpha1/labels.go | 0 .../{core => scheduling}/v1alpha1/register.go | 2 +- .../{core => scheduling}/v1alpha1/types.go | 37 +++++ .../v1alpha1/zz_generated.deepcopy.go | 76 +++++++++ pkg/client/clientset/versioned/clientset.go | 40 ++--- .../versioned/fake/clientset_generated.go | 24 +-- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../{core => scheduling}/v1alpha1/doc.go | 0 .../{core => scheduling}/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_podgroup.go | 20 ++- .../scheduling/v1alpha1/fake/fake_queue.go | 120 ++++++++++++++ .../v1alpha1/fake/fake_scheduling_client.go} | 12 +- .../v1alpha1/generated_expansion.go | 2 + .../{core => scheduling}/v1alpha1/podgroup.go | 21 ++- .../typed/scheduling/v1alpha1/queue.go | 147 +++++++++++++++++ .../v1alpha1/scheduling_client.go} | 33 ++-- .../informers/externalversions/factory.go | 12 +- .../informers/externalversions/generic.go | 18 +- .../{core => scheduling}/interface.go | 4 +- .../v1alpha1/interface.go | 7 + .../{core => scheduling}/v1alpha1/podgroup.go | 12 +- .../scheduling/v1alpha1/queue.go | 88 ++++++++++ .../v1alpha1/expansion_generated.go | 4 + .../{core => scheduling}/v1alpha1/podgroup.go | 2 +- .../listers/scheduling/v1alpha1/queue.go | 65 ++++++++ pkg/controller/job/job_controller.go | 4 +- pkg/controller/job/utils.go | 2 +- pkg/controller/queue/queue_controller.go | 154 ++++++++++++++++++ pkg/controller/queue/utils.go | 28 ++++ .../actions/allocate/allocate_test.go | 2 +- pkg/scheduler/api/job_info.go | 2 +- pkg/scheduler/api/types.go | 2 +- pkg/scheduler/cache/cache.go | 4 +- pkg/scheduler/cache/event_handlers.go | 2 +- pkg/scheduler/plugins/gang/gang.go | 2 +- 45 files changed, 899 insertions(+), 126 deletions(-) rename config/crds/{core_v1alpha1_podgroup.yaml => scheduling_v1alpha1_podgroup.yaml} (88%) create mode 100644 config/crds/scheduling_v1alpha1_queue.yaml delete mode 100755 hack/e2e-cluster.sh rename pkg/apis/{core => scheduling}/v1alpha1/doc.go (100%) rename pkg/apis/{core => scheduling}/v1alpha1/labels.go (100%) rename pkg/apis/{core => scheduling}/v1alpha1/register.go (96%) rename pkg/apis/{core => scheduling}/v1alpha1/types.go (74%) rename pkg/apis/{core => scheduling}/v1alpha1/zz_generated.deepcopy.go (65%) rename pkg/client/clientset/versioned/typed/{core => scheduling}/v1alpha1/doc.go (100%) rename pkg/client/clientset/versioned/typed/{core => scheduling}/v1alpha1/fake/doc.go (100%) rename pkg/client/clientset/versioned/typed/{core => scheduling}/v1alpha1/fake/fake_podgroup.go (85%) create mode 100644 pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go rename pkg/client/clientset/versioned/typed/{core/v1alpha1/fake/fake_core_client.go => scheduling/v1alpha1/fake/fake_scheduling_client.go} (74%) rename pkg/client/clientset/versioned/typed/{core => scheduling}/v1alpha1/generated_expansion.go (95%) rename pkg/client/clientset/versioned/typed/{core => scheduling}/v1alpha1/podgroup.go (88%) create mode 100644 pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go rename pkg/client/clientset/versioned/typed/{core/v1alpha1/core_client.go => scheduling/v1alpha1/scheduling_client.go} (65%) rename pkg/client/informers/externalversions/{core => scheduling}/interface.go (95%) rename pkg/client/informers/externalversions/{core => scheduling}/v1alpha1/interface.go (87%) rename pkg/client/informers/externalversions/{core => scheduling}/v1alpha1/podgroup.go (89%) create mode 100644 pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go rename pkg/client/listers/{core => scheduling}/v1alpha1/expansion_generated.go (88%) rename pkg/client/listers/{core => scheduling}/v1alpha1/podgroup.go (99%) create mode 100644 pkg/client/listers/scheduling/v1alpha1/queue.go create mode 100644 pkg/controller/queue/queue_controller.go create mode 100644 pkg/controller/queue/utils.go diff --git a/Makefile b/Makefile index d14c733772..e333a5d354 100644 --- a/Makefile +++ b/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 diff --git a/cmd/kar-controllers/app/server.go b/cmd/kar-controllers/app/server.go index 12959b7e94..3a9ee7a163 100644 --- a/cmd/kar-controllers/app/server.go +++ b/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 } diff --git a/config/crds/core_v1alpha1_podgroup.yaml b/config/crds/scheduling_v1alpha1_podgroup.yaml similarity index 88% rename from config/crds/core_v1alpha1_podgroup.yaml rename to config/crds/scheduling_v1alpha1_podgroup.yaml index f64093a739..465a28bc6b 100644 --- a/config/crds/core_v1alpha1_podgroup.yaml +++ b/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 diff --git a/config/crds/scheduling_v1alpha1_queue.yaml b/config/crds/scheduling_v1alpha1_queue.yaml new file mode 100644 index 0000000000..06bb7a7464 --- /dev/null +++ b/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 diff --git a/hack/.golint_failures b/hack/.golint_failures index 319a17ae5e..685a659f1c 100644 --- a/hack/.golint_failures +++ b/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 diff --git a/hack/boilerplate/boilerplate.go.txt b/hack/boilerplate/boilerplate.go.txt index 59e740c1ee..565c6e4c99 100644 --- a/hack/boilerplate/boilerplate.go.txt +++ b/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. diff --git a/hack/e2e-cluster.sh b/hack/e2e-cluster.sh deleted file mode 100755 index fb7e80bab9..0000000000 --- a/hack/e2e-cluster.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -APISERVER_enable_admission_plugins=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Priority,ResourceQuota ./hack/dind-cluster-v1.11.sh up - -kc=$(which kubectl) - -if [ -z ${kc} ]; then - curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl - - chmod +x ./kubectl - - kc=./kubectl -fi - -${kc} config set-cluster dind --server=http://localhost:8080 --insecure-skip-tls-verify -${kc} config set-context dind --cluster=dind --namespace=default -${kc} config set current-context dind - -${kc} create -f config/crds/core_v1alpha1_podgroup.yaml -${kc} create -f config/crds/extensions_v1alpha1_job.yaml - -killall -9 kar-controllers kar-scheduler - -nohup _output/bin/kar-controllers --master localhost:8080 --logtostderr --v 3 > controller.log 2>&1 & -nohup _output/bin/kar-scheduler --master localhost:8080 --logtostderr --v 3 > scheduler.log 2>&1 & - diff --git a/hack/run-e2e.sh b/hack/run-e2e.sh index f2facb6945..417dc25ab0 100755 --- a/hack/run-e2e.sh +++ b/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 diff --git a/pkg/apis/core/v1alpha1/doc.go b/pkg/apis/scheduling/v1alpha1/doc.go similarity index 100% rename from pkg/apis/core/v1alpha1/doc.go rename to pkg/apis/scheduling/v1alpha1/doc.go diff --git a/pkg/apis/core/v1alpha1/labels.go b/pkg/apis/scheduling/v1alpha1/labels.go similarity index 100% rename from pkg/apis/core/v1alpha1/labels.go rename to pkg/apis/scheduling/v1alpha1/labels.go diff --git a/pkg/apis/core/v1alpha1/register.go b/pkg/apis/scheduling/v1alpha1/register.go similarity index 96% rename from pkg/apis/core/v1alpha1/register.go rename to pkg/apis/scheduling/v1alpha1/register.go index 3dbe607fbb..260c33855e 100644 --- a/pkg/apis/core/v1alpha1/register.go +++ b/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"} diff --git a/pkg/apis/core/v1alpha1/types.go b/pkg/apis/scheduling/v1alpha1/types.go similarity index 74% rename from pkg/apis/core/v1alpha1/types.go rename to pkg/apis/scheduling/v1alpha1/types.go index d0118aa9fa..318d1524e9 100644 --- a/pkg/apis/core/v1alpha1/types.go +++ b/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"` +} diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go similarity index 65% rename from pkg/apis/core/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go index 9caf7ec305..723de4fec0 100644 --- a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go @@ -138,3 +138,79 @@ func (in *PodGroupStatus) DeepCopy() *PodGroupStatus { in.DeepCopyInto(out) return out } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Queue) DeepCopyInto(out *Queue) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Queue. +func (in *Queue) DeepCopy() *Queue { + if in == nil { + return nil + } + out := new(Queue) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Queue) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *QueueList) DeepCopyInto(out *QueueList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodGroup, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueueList. +func (in *QueueList) DeepCopy() *QueueList { + if in == nil { + return nil + } + out := new(QueueList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *QueueList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// 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 + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueueSpec. +func (in *QueueSpec) DeepCopy() *QueueSpec { + if in == nil { + return nil + } + out := new(QueueSpec) + in.DeepCopyInto(out) + return out +} diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index e09aee9db0..8cc3c43c0d 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - corev1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/core/v1alpha1" extensionsv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/extensions/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -28,31 +28,20 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - CoreV1alpha1() corev1alpha1.CoreV1alpha1Interface - // Deprecated: please explicitly pick a version if possible. - Core() corev1alpha1.CoreV1alpha1Interface ExtensionsV1alpha1() extensionsv1alpha1.ExtensionsV1alpha1Interface // Deprecated: please explicitly pick a version if possible. Extensions() extensionsv1alpha1.ExtensionsV1alpha1Interface + SchedulingV1alpha1() schedulingv1alpha1.SchedulingV1alpha1Interface + // Deprecated: please explicitly pick a version if possible. + Scheduling() schedulingv1alpha1.SchedulingV1alpha1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - coreV1alpha1 *corev1alpha1.CoreV1alpha1Client extensionsV1alpha1 *extensionsv1alpha1.ExtensionsV1alpha1Client -} - -// CoreV1alpha1 retrieves the CoreV1alpha1Client -func (c *Clientset) CoreV1alpha1() corev1alpha1.CoreV1alpha1Interface { - return c.coreV1alpha1 -} - -// Deprecated: Core retrieves the default version of CoreClient. -// Please explicitly pick a version. -func (c *Clientset) Core() corev1alpha1.CoreV1alpha1Interface { - return c.coreV1alpha1 + schedulingV1alpha1 *schedulingv1alpha1.SchedulingV1alpha1Client } // ExtensionsV1alpha1 retrieves the ExtensionsV1alpha1Client @@ -66,6 +55,17 @@ func (c *Clientset) Extensions() extensionsv1alpha1.ExtensionsV1alpha1Interface return c.extensionsV1alpha1 } +// SchedulingV1alpha1 retrieves the SchedulingV1alpha1Client +func (c *Clientset) SchedulingV1alpha1() schedulingv1alpha1.SchedulingV1alpha1Interface { + return c.schedulingV1alpha1 +} + +// Deprecated: Scheduling retrieves the default version of SchedulingClient. +// Please explicitly pick a version. +func (c *Clientset) Scheduling() schedulingv1alpha1.SchedulingV1alpha1Interface { + return c.schedulingV1alpha1 +} + // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { if c == nil { @@ -82,11 +82,11 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.coreV1alpha1, err = corev1alpha1.NewForConfig(&configShallowCopy) + cs.extensionsV1alpha1, err = extensionsv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.extensionsV1alpha1, err = extensionsv1alpha1.NewForConfig(&configShallowCopy) + cs.schedulingV1alpha1, err = schedulingv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -102,8 +102,8 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.coreV1alpha1 = corev1alpha1.NewForConfigOrDie(c) cs.extensionsV1alpha1 = extensionsv1alpha1.NewForConfigOrDie(c) + cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -112,8 +112,8 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.coreV1alpha1 = corev1alpha1.New(c) cs.extensionsV1alpha1 = extensionsv1alpha1.New(c) + cs.schedulingV1alpha1 = schedulingv1alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 4d190a0c44..6f1eebde2e 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -20,10 +20,10 @@ package fake import ( clientset "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" - corev1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/core/v1alpha1" - fakecorev1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/core/v1alpha1/fake" extensionsv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/extensions/v1alpha1" fakeextensionsv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/extensions/v1alpha1/fake" + schedulingv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + fakeschedulingv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -73,16 +73,6 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// CoreV1alpha1 retrieves the CoreV1alpha1Client -func (c *Clientset) CoreV1alpha1() corev1alpha1.CoreV1alpha1Interface { - return &fakecorev1alpha1.FakeCoreV1alpha1{Fake: &c.Fake} -} - -// Core retrieves the CoreV1alpha1Client -func (c *Clientset) Core() corev1alpha1.CoreV1alpha1Interface { - return &fakecorev1alpha1.FakeCoreV1alpha1{Fake: &c.Fake} -} - // ExtensionsV1alpha1 retrieves the ExtensionsV1alpha1Client func (c *Clientset) ExtensionsV1alpha1() extensionsv1alpha1.ExtensionsV1alpha1Interface { return &fakeextensionsv1alpha1.FakeExtensionsV1alpha1{Fake: &c.Fake} @@ -92,3 +82,13 @@ func (c *Clientset) ExtensionsV1alpha1() extensionsv1alpha1.ExtensionsV1alpha1In func (c *Clientset) Extensions() extensionsv1alpha1.ExtensionsV1alpha1Interface { return &fakeextensionsv1alpha1.FakeExtensionsV1alpha1{Fake: &c.Fake} } + +// SchedulingV1alpha1 retrieves the SchedulingV1alpha1Client +func (c *Clientset) SchedulingV1alpha1() schedulingv1alpha1.SchedulingV1alpha1Interface { + return &fakeschedulingv1alpha1.FakeSchedulingV1alpha1{Fake: &c.Fake} +} + +// Scheduling retrieves the SchedulingV1alpha1Client +func (c *Clientset) Scheduling() schedulingv1alpha1.SchedulingV1alpha1Interface { + return &fakeschedulingv1alpha1.FakeSchedulingV1alpha1{Fake: &c.Fake} +} diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 5142ad959e..d6861f2ceb 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( - corev1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" extensionsv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/extensions/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -51,6 +51,6 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - corev1alpha1.AddToScheme(scheme) extensionsv1alpha1.AddToScheme(scheme) + schedulingv1alpha1.AddToScheme(scheme) } diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 0b8e2a3640..56206a51b3 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -19,8 +19,8 @@ limitations under the License. package scheme import ( - corev1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" extensionsv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/extensions/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -51,6 +51,6 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - corev1alpha1.AddToScheme(scheme) extensionsv1alpha1.AddToScheme(scheme) + schedulingv1alpha1.AddToScheme(scheme) } diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/doc.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/doc.go diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/fake/doc.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/doc.go diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_podgroup.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podgroup.go similarity index 85% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_podgroup.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podgroup.go index 8af3a721e5..707416a08c 100644 --- a/pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_podgroup.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podgroup.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -30,13 +30,13 @@ import ( // FakePodGroups implements PodGroupInterface type FakePodGroups struct { - Fake *FakeCoreV1alpha1 + Fake *FakeSchedulingV1alpha1 ns string } -var podgroupsResource = schema.GroupVersionResource{Group: "", Version: "v1alpha1", Resource: "podgroups"} +var podgroupsResource = schema.GroupVersionResource{Group: "scheduling", Version: "v1alpha1", Resource: "podgroups"} -var podgroupsKind = schema.GroupVersionKind{Group: "", Version: "v1alpha1", Kind: "PodGroup"} +var podgroupsKind = schema.GroupVersionKind{Group: "scheduling", Version: "v1alpha1", Kind: "PodGroup"} // Get takes name of the podGroup, and returns the corresponding podGroup object, and an error if there is any. func (c *FakePodGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.PodGroup, err error) { @@ -100,6 +100,18 @@ func (c *FakePodGroups) Update(podGroup *v1alpha1.PodGroup) (result *v1alpha1.Po return obj.(*v1alpha1.PodGroup), err } +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). +func (c *FakePodGroups) UpdateStatus(podGroup *v1alpha1.PodGroup) (*v1alpha1.PodGroup, error) { + obj, err := c.Fake. + Invokes(testing.NewUpdateSubresourceAction(podgroupsResource, "status", c.ns, podGroup), &v1alpha1.PodGroup{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodGroup), err +} + // Delete takes name of the podGroup and deletes it. Returns an error if one occurs. func (c *FakePodGroups) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go new file mode 100644 index 0000000000..c2a69387b9 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go @@ -0,0 +1,120 @@ +/* +Copyright 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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + schema "k8s.io/apimachinery/pkg/runtime/schema" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" +) + +// FakeQueues implements QueueInterface +type FakeQueues struct { + Fake *FakeSchedulingV1alpha1 +} + +var queuesResource = schema.GroupVersionResource{Group: "scheduling", Version: "v1alpha1", Resource: "queues"} + +var queuesKind = schema.GroupVersionKind{Group: "scheduling", Version: "v1alpha1", Kind: "Queue"} + +// Get takes name of the queue, and returns the corresponding queue object, and an error if there is any. +func (c *FakeQueues) Get(name string, options v1.GetOptions) (result *v1alpha1.Queue, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootGetAction(queuesResource, name), &v1alpha1.Queue{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.Queue), err +} + +// List takes label and field selectors, and returns the list of Queues that match those selectors. +func (c *FakeQueues) List(opts v1.ListOptions) (result *v1alpha1.QueueList, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootListAction(queuesResource, queuesKind, opts), &v1alpha1.QueueList{}) + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v1alpha1.QueueList{ListMeta: obj.(*v1alpha1.QueueList).ListMeta} + for _, item := range obj.(*v1alpha1.QueueList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested queues. +func (c *FakeQueues) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewRootWatchAction(queuesResource, opts)) +} + +// Create takes the representation of a queue and creates it. Returns the server's representation of the queue, and an error, if there is any. +func (c *FakeQueues) Create(queue *v1alpha1.Queue) (result *v1alpha1.Queue, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootCreateAction(queuesResource, queue), &v1alpha1.Queue{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.Queue), err +} + +// Update takes the representation of a queue and updates it. Returns the server's representation of the queue, and an error, if there is any. +func (c *FakeQueues) Update(queue *v1alpha1.Queue) (result *v1alpha1.Queue, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateAction(queuesResource, queue), &v1alpha1.Queue{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.Queue), err +} + +// Delete takes name of the queue and deletes it. Returns an error if one occurs. +func (c *FakeQueues) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewRootDeleteAction(queuesResource, name), &v1alpha1.Queue{}) + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeQueues) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := testing.NewRootDeleteCollectionAction(queuesResource, listOptions) + + _, err := c.Fake.Invokes(action, &v1alpha1.QueueList{}) + return err +} + +// Patch applies the patch and returns the patched queue. +func (c *FakeQueues) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Queue, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootPatchSubresourceAction(queuesResource, name, data, subresources...), &v1alpha1.Queue{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.Queue), err +} diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go similarity index 74% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go index f8f7cb8af7..61fac92b47 100644 --- a/pkg/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go @@ -19,22 +19,26 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeCoreV1alpha1 struct { +type FakeSchedulingV1alpha1 struct { *testing.Fake } -func (c *FakeCoreV1alpha1) PodGroups(namespace string) v1alpha1.PodGroupInterface { +func (c *FakeSchedulingV1alpha1) PodGroups(namespace string) v1alpha1.PodGroupInterface { return &FakePodGroups{c, namespace} } +func (c *FakeSchedulingV1alpha1) Queues() v1alpha1.QueueInterface { + return &FakeQueues{c} +} + // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCoreV1alpha1) RESTClient() rest.Interface { +func (c *FakeSchedulingV1alpha1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/generated_expansion.go similarity index 95% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/generated_expansion.go index 999084df86..f195814928 100644 --- a/pkg/client/clientset/versioned/typed/core/v1alpha1/generated_expansion.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/generated_expansion.go @@ -19,3 +19,5 @@ limitations under the License. package v1alpha1 type PodGroupExpansion interface{} + +type QueueExpansion interface{} diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/podgroup.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go similarity index 88% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/podgroup.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go index 8eac40391d..237ed5cb7c 100644 --- a/pkg/client/clientset/versioned/typed/core/v1alpha1/podgroup.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" scheme "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -37,6 +37,7 @@ type PodGroupsGetter interface { type PodGroupInterface interface { Create(*v1alpha1.PodGroup) (*v1alpha1.PodGroup, error) Update(*v1alpha1.PodGroup) (*v1alpha1.PodGroup, error) + UpdateStatus(*v1alpha1.PodGroup) (*v1alpha1.PodGroup, error) Delete(name string, options *v1.DeleteOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error Get(name string, options v1.GetOptions) (*v1alpha1.PodGroup, error) @@ -53,7 +54,7 @@ type podGroups struct { } // newPodGroups returns a PodGroups -func newPodGroups(c *CoreV1alpha1Client, namespace string) *podGroups { +func newPodGroups(c *SchedulingV1alpha1Client, namespace string) *podGroups { return &podGroups{ client: c.RESTClient(), ns: namespace, @@ -120,6 +121,22 @@ func (c *podGroups) Update(podGroup *v1alpha1.PodGroup) (result *v1alpha1.PodGro return } +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). + +func (c *podGroups) UpdateStatus(podGroup *v1alpha1.PodGroup) (result *v1alpha1.PodGroup, err error) { + result = &v1alpha1.PodGroup{} + err = c.client.Put(). + Namespace(c.ns). + Resource("podgroups"). + Name(podGroup.Name). + SubResource("status"). + Body(podGroup). + Do(). + Into(result) + return +} + // Delete takes name of the podGroup and deletes it. Returns an error if one occurs. func (c *podGroups) Delete(name string, options *v1.DeleteOptions) error { return c.client.Delete(). diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go new file mode 100644 index 0000000000..8138dc1ee4 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go @@ -0,0 +1,147 @@ +/* +Copyright 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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" + scheme "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// QueuesGetter has a method to return a QueueInterface. +// A group's client should implement this interface. +type QueuesGetter interface { + Queues() QueueInterface +} + +// QueueInterface has methods to work with Queue resources. +type QueueInterface interface { + Create(*v1alpha1.Queue) (*v1alpha1.Queue, error) + Update(*v1alpha1.Queue) (*v1alpha1.Queue, error) + Delete(name string, options *v1.DeleteOptions) error + DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(name string, options v1.GetOptions) (*v1alpha1.Queue, error) + List(opts v1.ListOptions) (*v1alpha1.QueueList, error) + Watch(opts v1.ListOptions) (watch.Interface, error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Queue, err error) + QueueExpansion +} + +// queues implements QueueInterface +type queues struct { + client rest.Interface +} + +// newQueues returns a Queues +func newQueues(c *SchedulingV1alpha1Client) *queues { + return &queues{ + client: c.RESTClient(), + } +} + +// Get takes name of the queue, and returns the corresponding queue object, and an error if there is any. +func (c *queues) Get(name string, options v1.GetOptions) (result *v1alpha1.Queue, err error) { + result = &v1alpha1.Queue{} + err = c.client.Get(). + Resource("queues"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Queues that match those selectors. +func (c *queues) List(opts v1.ListOptions) (result *v1alpha1.QueueList, err error) { + result = &v1alpha1.QueueList{} + err = c.client.Get(). + Resource("queues"). + VersionedParams(&opts, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested queues. +func (c *queues) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true + return c.client.Get(). + Resource("queues"). + VersionedParams(&opts, scheme.ParameterCodec). + Watch() +} + +// Create takes the representation of a queue and creates it. Returns the server's representation of the queue, and an error, if there is any. +func (c *queues) Create(queue *v1alpha1.Queue) (result *v1alpha1.Queue, err error) { + result = &v1alpha1.Queue{} + err = c.client.Post(). + Resource("queues"). + Body(queue). + Do(). + Into(result) + return +} + +// Update takes the representation of a queue and updates it. Returns the server's representation of the queue, and an error, if there is any. +func (c *queues) Update(queue *v1alpha1.Queue) (result *v1alpha1.Queue, err error) { + result = &v1alpha1.Queue{} + err = c.client.Put(). + Resource("queues"). + Name(queue.Name). + Body(queue). + Do(). + Into(result) + return +} + +// Delete takes name of the queue and deletes it. Returns an error if one occurs. +func (c *queues) Delete(name string, options *v1.DeleteOptions) error { + return c.client.Delete(). + Resource("queues"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *queues) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + return c.client.Delete(). + Resource("queues"). + VersionedParams(&listOptions, scheme.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Patch applies the patch and returns the patched queue. +func (c *queues) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Queue, err error) { + result = &v1alpha1.Queue{} + err = c.client.Patch(pt). + Resource("queues"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset/versioned/typed/core/v1alpha1/core_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go similarity index 65% rename from pkg/client/clientset/versioned/typed/core/v1alpha1/core_client.go rename to pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go index 8ab8f15dc1..807f94a49d 100644 --- a/pkg/client/clientset/versioned/typed/core/v1alpha1/core_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go @@ -19,28 +19,33 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) -type CoreV1alpha1Interface interface { +type SchedulingV1alpha1Interface interface { RESTClient() rest.Interface PodGroupsGetter + QueuesGetter } -// CoreV1alpha1Client is used to interact with features provided by the group. -type CoreV1alpha1Client struct { +// SchedulingV1alpha1Client is used to interact with features provided by the scheduling group. +type SchedulingV1alpha1Client struct { restClient rest.Interface } -func (c *CoreV1alpha1Client) PodGroups(namespace string) PodGroupInterface { +func (c *SchedulingV1alpha1Client) PodGroups(namespace string) PodGroupInterface { return newPodGroups(c, namespace) } -// NewForConfig creates a new CoreV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*CoreV1alpha1Client, error) { +func (c *SchedulingV1alpha1Client) Queues() QueueInterface { + return newQueues(c) +} + +// NewForConfig creates a new SchedulingV1alpha1Client for the given config. +func NewForConfig(c *rest.Config) (*SchedulingV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -49,12 +54,12 @@ func NewForConfig(c *rest.Config) (*CoreV1alpha1Client, error) { if err != nil { return nil, err } - return &CoreV1alpha1Client{client}, nil + return &SchedulingV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new CoreV1alpha1Client for the given config and +// NewForConfigOrDie creates a new SchedulingV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *CoreV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *SchedulingV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,9 +67,9 @@ func NewForConfigOrDie(c *rest.Config) *CoreV1alpha1Client { return client } -// New creates a new CoreV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *CoreV1alpha1Client { - return &CoreV1alpha1Client{c} +// New creates a new SchedulingV1alpha1Client for the given RESTClient. +func New(c rest.Interface) *SchedulingV1alpha1Client { + return &SchedulingV1alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { @@ -82,7 +87,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreV1alpha1Client) RESTClient() rest.Interface { +func (c *SchedulingV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 8c38e1623e..c29ca8c6df 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -24,9 +24,9 @@ import ( time "time" versioned "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" - core "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/core" extensions "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/extensions" internalinterfaces "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/internalinterfaces" + scheduling "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/scheduling" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -173,14 +173,14 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Core() core.Interface Extensions() extensions.Interface -} - -func (f *sharedInformerFactory) Core() core.Interface { - return core.New(f, f.namespace, f.tweakListOptions) + Scheduling() scheduling.Interface } func (f *sharedInformerFactory) Extensions() extensions.Interface { return extensions.New(f, f.namespace, f.tweakListOptions) } + +func (f *sharedInformerFactory) Scheduling() scheduling.Interface { + return scheduling.New(f, f.namespace, f.tweakListOptions) +} diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index e0519cf54c..0d339de80a 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,8 +21,8 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" - extensions_v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/extensions/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/extensions/v1alpha1" + scheduling_v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -53,14 +53,16 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=core, Version=v1alpha1 - case v1alpha1.SchemeGroupVersion.WithResource("podgroups"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Core().V1alpha1().PodGroups().Informer()}, nil - - // Group=extensions, Version=v1alpha1 - case extensions_v1alpha1.SchemeGroupVersion.WithResource("jobs"): + // Group=extensions, Version=v1alpha1 + case v1alpha1.SchemeGroupVersion.WithResource("jobs"): return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().V1alpha1().Jobs().Informer()}, nil + // Group=scheduling, Version=v1alpha1 + case scheduling_v1alpha1.SchemeGroupVersion.WithResource("podgroups"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduling().V1alpha1().PodGroups().Informer()}, nil + case scheduling_v1alpha1.SchemeGroupVersion.WithResource("queues"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduling().V1alpha1().Queues().Informer()}, nil + } return nil, fmt.Errorf("no informer found for %v", resource) diff --git a/pkg/client/informers/externalversions/core/interface.go b/pkg/client/informers/externalversions/scheduling/interface.go similarity index 95% rename from pkg/client/informers/externalversions/core/interface.go rename to pkg/client/informers/externalversions/scheduling/interface.go index f750937977..5863eb888a 100644 --- a/pkg/client/informers/externalversions/core/interface.go +++ b/pkg/client/informers/externalversions/scheduling/interface.go @@ -16,11 +16,11 @@ limitations under the License. // Code generated by informer-gen. DO NOT EDIT. -package core +package scheduling import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/core/v1alpha1" internalinterfaces "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/scheduling/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/core/v1alpha1/interface.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go similarity index 87% rename from pkg/client/informers/externalversions/core/v1alpha1/interface.go rename to pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go index 2ee4fa1422..c2e2550628 100644 --- a/pkg/client/informers/externalversions/core/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go @@ -26,6 +26,8 @@ import ( type Interface interface { // PodGroups returns a PodGroupInformer. PodGroups() PodGroupInformer + // Queues returns a QueueInformer. + Queues() QueueInformer } type version struct { @@ -43,3 +45,8 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList func (v *version) PodGroups() PodGroupInformer { return &podGroupInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } + +// Queues returns a QueueInformer. +func (v *version) Queues() QueueInformer { + return &queueInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} +} diff --git a/pkg/client/informers/externalversions/core/v1alpha1/podgroup.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go similarity index 89% rename from pkg/client/informers/externalversions/core/v1alpha1/podgroup.go rename to pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go index 719e21a4bb..299fe288d8 100644 --- a/pkg/client/informers/externalversions/core/v1alpha1/podgroup.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - core_v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + scheduling_v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" versioned "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" internalinterfaces "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/listers/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/listers/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -61,16 +61,16 @@ func NewFilteredPodGroupInformer(client versioned.Interface, namespace string, r if tweakListOptions != nil { tweakListOptions(&options) } - return client.CoreV1alpha1().PodGroups(namespace).List(options) + return client.SchedulingV1alpha1().PodGroups(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.CoreV1alpha1().PodGroups(namespace).Watch(options) + return client.SchedulingV1alpha1().PodGroups(namespace).Watch(options) }, }, - &core_v1alpha1.PodGroup{}, + &scheduling_v1alpha1.PodGroup{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *podGroupInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *podGroupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&core_v1alpha1.PodGroup{}, f.defaultInformer) + return f.factory.InformerFor(&scheduling_v1alpha1.PodGroup{}, f.defaultInformer) } func (f *podGroupInformer) Lister() v1alpha1.PodGroupLister { diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go new file mode 100644 index 0000000000..2ae02f01de --- /dev/null +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go @@ -0,0 +1,88 @@ +/* +Copyright 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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by informer-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + time "time" + + scheduling_v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" + versioned "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" + internalinterfaces "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/listers/scheduling/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" +) + +// QueueInformer provides access to a shared informer and lister for +// Queues. +type QueueInformer interface { + Informer() cache.SharedIndexInformer + Lister() v1alpha1.QueueLister +} + +type queueInformer struct { + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// NewQueueInformer constructs a new informer for Queue type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewQueueInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredQueueInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredQueueInformer constructs a new informer for Queue type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredQueueInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { + return cache.NewSharedIndexInformer( + &cache.ListWatch{ + ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.SchedulingV1alpha1().Queues().List(options) + }, + WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.SchedulingV1alpha1().Queues().Watch(options) + }, + }, + &scheduling_v1alpha1.Queue{}, + resyncPeriod, + indexers, + ) +} + +func (f *queueInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredQueueInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +} + +func (f *queueInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(&scheduling_v1alpha1.Queue{}, f.defaultInformer) +} + +func (f *queueInformer) Lister() v1alpha1.QueueLister { + return v1alpha1.NewQueueLister(f.Informer().GetIndexer()) +} diff --git a/pkg/client/listers/core/v1alpha1/expansion_generated.go b/pkg/client/listers/scheduling/v1alpha1/expansion_generated.go similarity index 88% rename from pkg/client/listers/core/v1alpha1/expansion_generated.go rename to pkg/client/listers/scheduling/v1alpha1/expansion_generated.go index 4bee06cb89..c8f5713cfe 100644 --- a/pkg/client/listers/core/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/scheduling/v1alpha1/expansion_generated.go @@ -25,3 +25,7 @@ type PodGroupListerExpansion interface{} // PodGroupNamespaceListerExpansion allows custom methods to be added to // PodGroupNamespaceLister. type PodGroupNamespaceListerExpansion interface{} + +// QueueListerExpansion allows custom methods to be added to +// QueueLister. +type QueueListerExpansion interface{} diff --git a/pkg/client/listers/core/v1alpha1/podgroup.go b/pkg/client/listers/scheduling/v1alpha1/podgroup.go similarity index 99% rename from pkg/client/listers/core/v1alpha1/podgroup.go rename to pkg/client/listers/scheduling/v1alpha1/podgroup.go index 900c406d8b..79b5b23bfd 100644 --- a/pkg/client/listers/core/v1alpha1/podgroup.go +++ b/pkg/client/listers/scheduling/v1alpha1/podgroup.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/scheduling/v1alpha1/queue.go b/pkg/client/listers/scheduling/v1alpha1/queue.go new file mode 100644 index 0000000000..9b5f83de93 --- /dev/null +++ b/pkg/client/listers/scheduling/v1alpha1/queue.go @@ -0,0 +1,65 @@ +/* +Copyright 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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// QueueLister helps list Queues. +type QueueLister interface { + // List lists all Queues in the indexer. + List(selector labels.Selector) (ret []*v1alpha1.Queue, err error) + // Get retrieves the Queue from the index for a given name. + Get(name string) (*v1alpha1.Queue, error) + QueueListerExpansion +} + +// queueLister implements the QueueLister interface. +type queueLister struct { + indexer cache.Indexer +} + +// NewQueueLister returns a new QueueLister. +func NewQueueLister(indexer cache.Indexer) QueueLister { + return &queueLister{indexer: indexer} +} + +// List lists all Queues in the indexer. +func (s *queueLister) List(selector labels.Selector) (ret []*v1alpha1.Queue, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1alpha1.Queue)) + }) + return ret, err +} + +// Get retrieves the Queue from the index for a given name. +func (s *queueLister) Get(name string) (*v1alpha1.Queue, error) { + obj, exists, err := s.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1alpha1.Resource("queue"), name) + } + return obj.(*v1alpha1.Queue), nil +} diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 07f066c311..e54d78b9b2 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -316,13 +316,13 @@ func (cc *Controller) manageJob(qj *arbextv1.Job, pods map[string][]*v1.Pod) err succeededSum := int32(0) failedSum := int32(0) - ss, err := cc.arbclients.Core().PodGroups(qj.Namespace).List(metav1.ListOptions{ + ss, err := cc.arbclients.Scheduling().PodGroups(qj.Namespace).List(metav1.ListOptions{ FieldSelector: fmt.Sprintf("metadata.name=%s", qj.Name), }) if len(ss.Items) == 0 { schedSpc := createPodGroup(qj) - _, err := cc.arbclients.Core().PodGroups(qj.Namespace).Create(schedSpc) + _, err := cc.arbclients.Scheduling().PodGroups(qj.Namespace).Create(schedSpc) if err != nil { glog.Errorf("Failed to create PodGroup for Job %v/%v: %v", qj.Namespace, qj.Name, err) diff --git a/pkg/controller/job/utils.go b/pkg/controller/job/utils.go index 6e1a9f69e3..26376cbcc8 100644 --- a/pkg/controller/job/utils.go +++ b/pkg/controller/job/utils.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" extv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/extensions/v1alpha1" + arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" ) var JobKind = arbv1.SchemeGroupVersion.WithKind("Job") diff --git a/pkg/controller/queue/queue_controller.go b/pkg/controller/queue/queue_controller.go new file mode 100644 index 0000000000..ce561e2706 --- /dev/null +++ b/pkg/controller/queue/queue_controller.go @@ -0,0 +1,154 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package queue + +import ( + "time" + + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/informers" + coreinformers "k8s.io/client-go/informers/core/v1" + "k8s.io/client-go/kubernetes" + corelisters "k8s.io/client-go/listers/core/v1" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/cache" + + arbschedv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" + arbinformers "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions" + schedinfov1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/scheduling/v1alpha1" + schedlisterv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/listers/scheduling/v1alpha1" +) + +type Controller struct { + config *rest.Config + queueInformer schedinfov1.QueueInformer + nsInformer coreinformers.NamespaceInformer + + // A store of jobs + queueLister schedlisterv1.QueueLister + queueSynced func() bool + + // A store of pods, populated by the podController + nsListr corelisters.NamespaceLister + nsSynced func() bool + + kubeclients *kubernetes.Clientset + arbclients *versioned.Clientset + + // eventQueue that need to sync up + eventQueue *cache.FIFO +} + +func NewController(config *rest.Config) *Controller { + c := &Controller{ + config: config, + kubeclients: kubernetes.NewForConfigOrDie(config), + arbclients: versioned.NewForConfigOrDie(config), + eventQueue: cache.NewFIFO(eventKey), + } + + c.queueInformer = arbinformers.NewSharedInformerFactory(c.arbclients, 0).Scheduling().V1alpha1().Queues() + c.queueInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{ + DeleteFunc: c.deleteQueue, + }) + c.queueLister = c.queueInformer.Lister() + c.queueSynced = c.queueInformer.Informer().HasSynced + + c.nsInformer = informers.NewSharedInformerFactory(c.kubeclients, 0).Core().V1().Namespaces() + c.nsInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{ + AddFunc: c.addNS, + UpdateFunc: c.updateNS, + DeleteFunc: c.deleteNS, + }) + + c.nsListr = c.nsInformer.Lister() + c.nsSynced = c.nsInformer.Informer().HasSynced + + return c +} + +// Run start Job Controller +func (c *Controller) Run(stopCh <-chan struct{}) { + go c.queueInformer.Informer().Run(stopCh) + go c.nsInformer.Informer().Run(stopCh) + + cache.WaitForCacheSync(stopCh, c.queueSynced, c.nsSynced) + + go wait.Until(c.worker, time.Second, stopCh) +} + +func (c *Controller) worker() { + c.eventQueue.Pop(func(item interface{}) error { + nsName := item.(string) + + // If the Namespace does not exist, delete Queue accordingly. + if _, err := c.kubeclients.CoreV1().Namespaces().Get(nsName, metav1.GetOptions{}); err != nil { + if errors.IsNotFound(err) { + if err := c.arbclients.SchedulingV1alpha1().Queues().Delete(nsName, metav1.NewDeleteOptions(0)); err != nil { + if !errors.IsNotFound(err) { + return err + } + return nil + } + return nil + } + return err + } + + if _, err := c.arbclients.SchedulingV1alpha1().Queues().Get(nsName, metav1.GetOptions{}); err != nil { + if errors.IsNotFound(err) { + q := &arbschedv1.Queue{ + ObjectMeta: metav1.ObjectMeta{ + Name: nsName, + }, + Spec: arbschedv1.QueueSpec{ + Weight: int32(1), + }, + } + _, err := c.arbclients.SchedulingV1alpha1().Queues().Create(q) + return err + } + return err + } + + return nil + }) +} + +func (c *Controller) deleteQueue(obj interface{}) { + q := obj.(*arbschedv1.Queue) + c.eventQueue.AddIfNotPresent(q.Name) +} + +func (c *Controller) addNS(obj interface{}) { + ns := obj.(*v1.Namespace) + c.eventQueue.AddIfNotPresent(ns.Name) +} + +func (c *Controller) updateNS(old, obj interface{}) { + ns := obj.(*v1.Namespace) + c.eventQueue.AddIfNotPresent(ns.Name) +} + +func (c *Controller) deleteNS(obj interface{}) { + ns := obj.(*v1.Namespace) + c.eventQueue.AddIfNotPresent(ns.Name) +} diff --git a/pkg/controller/queue/utils.go b/pkg/controller/queue/utils.go new file mode 100644 index 0000000000..6da0a532f9 --- /dev/null +++ b/pkg/controller/queue/utils.go @@ -0,0 +1,28 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package queue + +import "k8s.io/apimachinery/pkg/api/meta" + +func eventKey(obj interface{}) (string, error) { + accessor, err := meta.Accessor(obj) + if err != nil { + return "", err + } + + return string(accessor.GetUID()), nil +} diff --git a/pkg/scheduler/actions/allocate/allocate_test.go b/pkg/scheduler/actions/allocate/allocate_test.go index c14fba032a..2e32a7222c 100644 --- a/pkg/scheduler/actions/allocate/allocate_test.go +++ b/pkg/scheduler/actions/allocate/allocate_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/api" "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/cache" "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/framework" diff --git a/pkg/scheduler/api/job_info.go b/pkg/scheduler/api/job_info.go index 16b47662c5..f5f9deddef 100644 --- a/pkg/scheduler/api/job_info.go +++ b/pkg/scheduler/api/job_info.go @@ -23,7 +23,7 @@ import ( policyv1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/types" - arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/utils" ) diff --git a/pkg/scheduler/api/types.go b/pkg/scheduler/api/types.go index 36e8a2d16f..3fc6279c0c 100644 --- a/pkg/scheduler/api/types.go +++ b/pkg/scheduler/api/types.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" ) // TaskStatus defines the status of a task/pod. diff --git a/pkg/scheduler/cache/cache.go b/pkg/scheduler/cache/cache.go index f1048fd657..9a86ef038f 100644 --- a/pkg/scheduler/cache/cache.go +++ b/pkg/scheduler/cache/cache.go @@ -38,7 +38,7 @@ import ( "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned" "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/versioned/scheme" arbinfo "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions" - arbcoreinfo "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/core/v1alpha1" + arbcoreinfo "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/informers/externalversions/scheduling/v1alpha1" arbapi "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/api" ) @@ -201,7 +201,7 @@ func newSchedulerCache(config *rest.Config, schedulerName string) *SchedulerCach arbinformer := arbinfo.NewSharedInformerFactory(sc.arbclient, 0) // create informer for Queue information - sc.podGroupInformer = arbinformer.Core().V1alpha1().PodGroups() + sc.podGroupInformer = arbinformer.Scheduling().V1alpha1().PodGroups() sc.podGroupInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: sc.AddPodGroup, UpdateFunc: sc.UpdatePodGroup, diff --git a/pkg/scheduler/cache/event_handlers.go b/pkg/scheduler/cache/event_handlers.go index f5ba84aec5..fbf02938a9 100644 --- a/pkg/scheduler/cache/event_handlers.go +++ b/pkg/scheduler/cache/event_handlers.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/utils" arbapi "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/api" ) diff --git a/pkg/scheduler/plugins/gang/gang.go b/pkg/scheduler/plugins/gang/gang.go index 141890f7f4..691e38e341 100644 --- a/pkg/scheduler/plugins/gang/gang.go +++ b/pkg/scheduler/plugins/gang/gang.go @@ -19,7 +19,7 @@ package gang import ( "github.com/golang/glog" - arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/core/v1alpha1" + arbcorev1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/scheduling/v1alpha1" "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/api" "github.com/kubernetes-incubator/kube-arbitrator/pkg/scheduler/framework" )