Skip to content

Commit

Permalink
Merge pull request kubernetes-retired#791 from hzxuzhonghu/revert
Browse files Browse the repository at this point in the history
restore kube-batch
  • Loading branch information
k8s-ci-robot authored Apr 17, 2019
2 parents 0ba387a + 34b05cc commit 9bff72f
Show file tree
Hide file tree
Showing 117 changed files with 294 additions and 294 deletions.
2 changes: 1 addition & 1 deletion pkg/admission/admission_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"

v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/admission/admit_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation"

v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins"
v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins"
)

// AdmitJobs function is used to admit jobs
Expand Down
2 changes: 1 addition & 1 deletion pkg/admission/mutate_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/api/admission/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
)

type patchOperation struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"

vkbatchv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
vkcorev1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1"
vkbatchv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
vkcorev1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1"
)

var JobKind = vkbatchv1.SchemeGroupVersion.WithKind("Job")
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"

vkbatchv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
vkcorev1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1"
vkbatchv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
vkcorev1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1"
)

var JobKind = vkbatchv1.SchemeGroupVersion.WithKind("Job")
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/job/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned"
"github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
)

type listFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/job/resume.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package job
import (
"github.com/spf13/cobra"

"github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
)

type resumeFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/job/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

vkapi "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned"
vkapi "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
)

type runFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/job/suspend.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package job
import (
"github.com/spf13/cobra"

"github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
)

type suspendFlags struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/cli/job/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

vkbatchv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1"
vkbusv1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1"
"github.com/kubernetes-sigs/volcano/pkg/apis/helpers"
"github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned"
vkbatchv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1"
vkbusv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
)

func homeDir() string {
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/typed/batch/v1alpha1/job.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/typed/bus/v1alpha1/command.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/informers/externalversions/batch/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/client/informers/externalversions/batch/v1alpha1/job.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/informers/externalversions/bus/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/client/informers/externalversions/bus/v1alpha1/command.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pkg/client/informers/externalversions/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9bff72f

Please sign in to comment.