volcano-sh
/
volcano
mirror of https://github.com/volcano-sh/volcano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from k82cn/code_clear_2 

Code clearup.
This commit is contained in:
Klaus Ma 2017-12-23 10:58:24 +08:00 committed by GitHub
parent 66b976c7f2 0d01fab752
commit 6a4c47b1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/arbclientset/arbclientset.go → pkg/client/clientset/clientset.go
View File

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package arbclientset
package clientset
import (
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset/typed/arb/v1"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/typed/v1"
rest "k8s.io/client-go/rest"
"k8s.io/client-go/rest"
)
type Interface interface {

0
pkg/client/arbclientset/scheme/register.go → pkg/client/clientset/scheme/register.go
View File

0
pkg/client/arbclientset/typed/arb/v1/arb_client.go → pkg/client/clientset/typed/v1/client.go
View File

2
pkg/client/arbclientset/typed/arb/v1/queue.go → pkg/client/clientset/typed/v1/queue.go
View File

@ -18,7 +18,7 @@ package v1
import (
"github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset/scheme"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/scheme"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"

3
pkg/client/arbclientset/typed/arb/v1/queuejob.go → pkg/client/clientset/typed/v1/queuejob.go
View File

@ -18,7 +18,7 @@ package v1
import (
"github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset/scheme"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset/scheme"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
@ -78,7 +78,6 @@ func (c *queuejobs) Update(queuejob *v1.QueueJob) (result *v1.QueueJob, err erro
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
func (c *queuejobs) UpdateStatus(queuejob *v1.QueueJob) (result *v1.QueueJob, err error) {
result = &v1.QueueJob{}
err = c.client.Put().

16
pkg/client/queue.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"time"
crv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@ -35,12 +35,12 @@ import (
func NewClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, error) {
scheme := runtime.NewScheme()
if err := crv1.AddToScheme(scheme); err != nil {
if err := arbv1.AddToScheme(scheme); err != nil {
return nil, nil, err
}
config := *cfg
config.GroupVersion = &crv1.SchemeGroupVersion
config.GroupVersion = &arbv1.SchemeGroupVersion
config.APIPath = "/apis"
config.ContentType = runtime.ContentTypeJSON
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}
@ -53,7 +53,7 @@ func NewClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, error) {
return client, scheme, nil
}
const queueCRDName = crv1.QueuePlural + "." + crv1.GroupName
const queueCRDName = arbv1.QueuePlural + "." + arbv1.GroupName
func CreateQueueCRD(clientset apiextensionsclient.Interface) (*apiextensionsv1beta1.CustomResourceDefinition, error) {
crd := &apiextensionsv1beta1.CustomResourceDefinition{
@ -61,12 +61,12 @@ func CreateQueueCRD(clientset apiextensionsclient.Interface) (*apiextensionsv1be
Name: queueCRDName,
},
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
Group: crv1.GroupName,
Version: crv1.SchemeGroupVersion.Version,
Group: arbv1.GroupName,
Version: arbv1.SchemeGroupVersion.Version,
Scope: apiextensionsv1beta1.NamespaceScoped,
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
Plural: crv1.QueuePlural,
Kind: reflect.TypeOf(crv1.Queue{}).Name(),
Plural: arbv1.QueuePlural,
Kind: reflect.TypeOf(arbv1.Queue{}).Name(),
},
},
}

16
pkg/client/queuejob.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"time"
crv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
arbv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@ -35,12 +35,12 @@ import (
func NewQueueJobClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, error) {
scheme := runtime.NewScheme()
if err := crv1.AddToScheme(scheme); err != nil {
if err := arbv1.AddToScheme(scheme); err != nil {
return nil, nil, err
}
config := *cfg
config.GroupVersion = &crv1.SchemeGroupVersion
config.GroupVersion = &arbv1.SchemeGroupVersion
config.APIPath = "/apis"
config.ContentType = runtime.ContentTypeJSON
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}
@ -53,7 +53,7 @@ func NewQueueJobClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, err
return client, scheme, nil
}
const queueJobCRDName = crv1.QueueJobPlural + "." + crv1.GroupName
const queueJobCRDName = arbv1.QueueJobPlural + "." + arbv1.GroupName
func CreateQueueJobCRD(clientset apiextensionsclient.Interface) (*apiextensionsv1beta1.CustomResourceDefinition, error) {
crd := &apiextensionsv1beta1.CustomResourceDefinition{
@ -61,12 +61,12 @@ func CreateQueueJobCRD(clientset apiextensionsclient.Interface) (*apiextensionsv
Name: queueJobCRDName,
},
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
Group: crv1.GroupName,
Version: crv1.SchemeGroupVersion.Version,
Group: arbv1.GroupName,
Version: arbv1.SchemeGroupVersion.Version,
Scope: apiextensionsv1beta1.NamespaceScoped,
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
Plural: crv1.QueueJobPlural,
Kind: reflect.TypeOf(crv1.QueueJob{}).Name(),
Plural: arbv1.QueueJobPlural,
Kind: reflect.TypeOf(arbv1.QueueJob{}).Name(),
},
},
}

4
pkg/controller/queue_controller.go
View File

@ -20,7 +20,7 @@ import (
"time"
"github.com/golang/glog"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/policy"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/policy/preemption"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/schedulercache"
@ -66,7 +66,7 @@ func (q *QueueController) updateQueueJob(assignedQJ map[string]*schedulercache.Q
glog.V(4).Infof("scheduler, assign queuejob %s cpu %d memory %d\n", qj.Name(), cpuInt, memInt)
}
cs, err := arbclientset.NewForConfig(q.config)
cs, err := clientset.NewForConfig(q.config)
if err != nil {
glog.Errorf("Fail to create client for queuejob, %#v", err)
return

4
pkg/policy/preemption/preemption.go
View File

@ -23,7 +23,7 @@ import (
"github.com/golang/glog"
apiv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/policy/util"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/schedulercache"
@ -123,7 +123,7 @@ func killPod(client *kubernetes.Clientset, pod *v1.Pod) error {
}
func updateQueues(queues map[string]*schedulercache.QueueInfo, config *rest.Config) error {
cs, err := arbclientset.NewForConfig(config)
cs, err := clientset.NewForConfig(config)
if err != nil {
glog.Errorf("Fail to create client for queue, %#v", err)
return nil

12
test/integration/arbitrator/arbitrator_test.go
View File

@ -23,7 +23,7 @@ import (
apiv1 "github.com/kubernetes-incubator/kube-arbitrator/pkg/apis/v1"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/client/arbclientset"
arbclient "github.com/kubernetes-incubator/kube-arbitrator/pkg/client/clientset"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/controller"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/policy"
"github.com/kubernetes-incubator/kube-arbitrator/pkg/policy/preemption"
@ -193,7 +193,7 @@ func prepareResourceQuota(cs *clientset.Clientset) error {
// create two Queues, "queue01" and "queue02"
// "queue01" is under namespace "ns01" and has attribute "weight=1"
// "queue02" is under namespace "ns02" and has attribute "weight=2"
func prepareQueue(cs *arbclientset.Clientset) error {
func prepareQueue(cs *arbclient.Clientset) error {
queue := &apiv1.Queue{
ObjectMeta: metav1.ObjectMeta{
Name: "xxx",
@ -252,7 +252,7 @@ func prepareQueue(cs *arbclientset.Clientset) error {
// create four queuejob
// "ts01-1" and "ts01-2", under "queue01"
// "ts02-1" and "ts02-2", under "queue02"
func prepareQueueJob(cs *arbclientset.Clientset) error {
func prepareQueueJob(cs *arbclient.Clientset) error {
ts := &apiv1.QueueJob{
ObjectMeta: metav1.ObjectMeta{
Name: "xxx",
@ -341,7 +341,7 @@ func prepareQueueJob(cs *arbclientset.Clientset) error {
// prepareCRDForPreemption create one Queue "queue03"
// "queue03" is under namespace "ns03" and has attribute "weight=2"
func prepareQueueForPreemption(cs *arbclientset.Clientset) error {
func prepareQueueForPreemption(cs *arbclient.Clientset) error {
queue := &apiv1.Queue{
ObjectMeta: metav1.ObjectMeta{
Name: "xxx",
@ -390,7 +390,7 @@ func prepareQueueForPreemption(cs *arbclientset.Clientset) error {
// prepareQueueJobForPreemption prepare customer resource definition "QueueJob"
// create two queuejob
// "ts03-1" and "ts03-2", under "queue03"
func prepareQueueJobForPreemption(cs *arbclientset.Clientset) error {
func prepareQueueJobForPreemption(cs *arbclient.Clientset) error {
ts := &apiv1.QueueJob{
ObjectMeta: metav1.ObjectMeta{
Name: "xxx",
@ -547,7 +547,7 @@ func TestArbitrator(t *testing.T) {
cs := clientset.NewForConfigOrDie(config)
defer cs.CoreV1().Nodes().DeleteCollection(nil, metav1.ListOptions{})
crdcs := arbclientset.NewForConfigOrDie(config)
crdcs := arbclient.NewForConfigOrDie(config)
err := prepareCRD(config)
if err != nil {