From 34b05ccda27eb45ad679faebd4ea7cbf1ccc279f Mon Sep 17 00:00:00 2001 From: xuzhonghu Date: Tue, 16 Apr 2019 18:05:34 +0800 Subject: [PATCH] restore kube-batch --- pkg/admission/admission_controller.go | 2 +- pkg/admission/admit_job.go | 4 +-- pkg/admission/mutate_job.go | 2 +- pkg/apis/helpers/helpers.go | 6 ++-- pkg/apis/utils/utils.go | 6 ++-- pkg/cli/job/list.go | 4 +-- pkg/cli/job/resume.go | 2 +- pkg/cli/job/run.go | 4 +-- pkg/cli/job/suspend.go | 2 +- pkg/cli/job/util.go | 8 +++--- pkg/client/clientset/versioned/clientset.go | 6 ++-- .../versioned/fake/clientset_generated.go | 14 +++++----- .../clientset/versioned/fake/register.go | 6 ++-- .../clientset/versioned/scheme/register.go | 6 ++-- .../typed/batch/v1alpha1/batch_client.go | 4 +-- .../batch/v1alpha1/fake/fake_batch_client.go | 2 +- .../typed/batch/v1alpha1/fake/fake_job.go | 2 +- .../versioned/typed/batch/v1alpha1/job.go | 4 +-- .../typed/bus/v1alpha1/bus_client.go | 4 +-- .../versioned/typed/bus/v1alpha1/command.go | 4 +-- .../bus/v1alpha1/fake/fake_bus_client.go | 2 +- .../typed/bus/v1alpha1/fake/fake_command.go | 2 +- .../scheduling/v1alpha1/fake/fake_podgroup.go | 2 +- .../scheduling/v1alpha1/fake/fake_queue.go | 2 +- .../v1alpha1/fake/fake_scheduling_client.go | 2 +- .../typed/scheduling/v1alpha1/podgroup.go | 4 +-- .../typed/scheduling/v1alpha1/queue.go | 4 +-- .../scheduling/v1alpha1/scheduling_client.go | 4 +-- .../externalversions/batch/interface.go | 4 +-- .../batch/v1alpha1/interface.go | 2 +- .../externalversions/batch/v1alpha1/job.go | 8 +++--- .../externalversions/bus/interface.go | 4 +-- .../externalversions/bus/v1alpha1/command.go | 8 +++--- .../bus/v1alpha1/interface.go | 2 +- .../informers/externalversions/factory.go | 10 +++---- .../informers/externalversions/generic.go | 6 ++-- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/scheduling/interface.go | 4 +-- .../scheduling/v1alpha1/interface.go | 2 +- .../scheduling/v1alpha1/podgroup.go | 8 +++--- .../scheduling/v1alpha1/queue.go | 8 +++--- .../informers/internalversion/factory.go | 4 +-- .../informers/internalversion/generic.go | 2 +- .../internalversion/v1alpha1/interface.go | 4 +-- .../v1alpha1/internalversion/interface.go | 2 +- .../v1alpha1/internalversion/podgroup.go | 6 ++-- .../v1alpha1/internalversion/queue.go | 6 ++-- pkg/client/listers/batch/v1alpha1/job.go | 2 +- pkg/client/listers/bus/v1alpha1/command.go | 2 +- .../listers/scheduling/v1alpha1/podgroup.go | 2 +- .../listers/scheduling/v1alpha1/queue.go | 2 +- .../v1alpha1/internalversion/podgroup.go | 2 +- .../listers/v1alpha1/internalversion/queue.go | 2 +- pkg/controllers/apis/job_info.go | 2 +- pkg/controllers/cache/cache.go | 4 +-- pkg/controllers/cache/interface.go | 4 +-- pkg/controllers/job/job_controller.go | 28 +++++++++---------- pkg/controllers/job/job_controller_actions.go | 16 +++++------ pkg/controllers/job/job_controller_handler.go | 8 +++--- pkg/controllers/job/job_controller_plugins.go | 6 ++-- pkg/controllers/job/job_controller_util.go | 12 ++++---- pkg/controllers/job/plugins/env/env.go | 8 +++--- pkg/controllers/job/plugins/factory.go | 6 ++-- .../job/plugins/interface/interface.go | 2 +- pkg/controllers/job/plugins/ssh/ssh.go | 8 +++--- pkg/controllers/job/state/aborted.go | 4 +-- pkg/controllers/job/state/aborting.go | 4 +-- pkg/controllers/job/state/completing.go | 4 +-- pkg/controllers/job/state/factory.go | 4 +-- pkg/controllers/job/state/finished.go | 4 +-- pkg/controllers/job/state/pending.go | 4 +-- pkg/controllers/job/state/restarting.go | 4 +-- pkg/controllers/job/state/running.go | 4 +-- pkg/controllers/job/state/terminating.go | 4 +-- pkg/controllers/job/state/util.go | 2 +- pkg/scheduler/actions/allocate/allocate.go | 6 ++-- .../actions/allocate/allocate_test.go | 14 +++++----- pkg/scheduler/actions/backfill/backfill.go | 4 +-- pkg/scheduler/actions/factory.go | 10 +++---- pkg/scheduler/actions/preempt/preempt.go | 8 +++--- pkg/scheduler/actions/preempt/preempt_test.go | 4 +-- pkg/scheduler/actions/reclaim/reclaim.go | 6 ++-- pkg/scheduler/api/helpers/helpers.go | 2 +- pkg/scheduler/api/job_info.go | 2 +- pkg/scheduler/api/queue_info.go | 2 +- pkg/scheduler/cache/cache.go | 18 ++++++------ pkg/scheduler/cache/cache_test.go | 2 +- pkg/scheduler/cache/event_handlers.go | 6 ++-- pkg/scheduler/cache/interface.go | 4 +-- pkg/scheduler/cache/util.go | 6 ++-- pkg/scheduler/framework/event.go | 2 +- pkg/scheduler/framework/framework.go | 6 ++-- pkg/scheduler/framework/session.go | 10 +++---- pkg/scheduler/framework/session_plugins.go | 2 +- pkg/scheduler/framework/statement.go | 2 +- .../plugins/conformance/conformance.go | 4 +-- pkg/scheduler/plugins/defaults.go | 2 +- pkg/scheduler/plugins/drf/drf.go | 6 ++-- pkg/scheduler/plugins/factory.go | 18 ++++++------ pkg/scheduler/plugins/gang/gang.go | 8 +++--- pkg/scheduler/plugins/nodeorder/nodeorder.go | 4 +-- .../plugins/predicates/predicates.go | 4 +-- pkg/scheduler/plugins/priority/priority.go | 4 +-- .../plugins/proportion/proportion.go | 6 ++-- pkg/scheduler/scheduler.go | 8 +++--- pkg/scheduler/util.go | 6 ++-- pkg/scheduler/util/priority_queue.go | 2 +- pkg/scheduler/util/scheduler_helper.go | 2 +- pkg/scheduler/util/scheduler_helper_test.go | 2 +- pkg/scheduler/util_test.go | 4 +-- test/e2e/admission.go | 2 +- test/e2e/command.go | 4 +-- test/e2e/job_error_handling.go | 4 +-- test/e2e/job_plugins.go | 2 +- test/e2e/kube-batch/util.go | 6 ++-- test/e2e/mpi.go | 2 +- test/e2e/util.go | 12 ++++---- 117 files changed, 294 insertions(+), 294 deletions(-) diff --git a/pkg/admission/admission_controller.go b/pkg/admission/admission_controller.go index a85c05d47..896bfa30d 100644 --- a/pkg/admission/admission_controller.go +++ b/pkg/admission/admission_controller.go @@ -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 ( diff --git a/pkg/admission/admit_job.go b/pkg/admission/admit_job.go index c44aa41f7..ca4c2ec1b 100644 --- a/pkg/admission/admit_job.go +++ b/pkg/admission/admit_job.go @@ -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 diff --git a/pkg/admission/mutate_job.go b/pkg/admission/mutate_job.go index f72caea66..e8b0808e2 100644 --- a/pkg/admission/mutate_job.go +++ b/pkg/admission/mutate_job.go @@ -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 { diff --git a/pkg/apis/helpers/helpers.go b/pkg/apis/helpers/helpers.go index 12dcdeb4d..3b6a5b7f0 100644 --- a/pkg/apis/helpers/helpers.go +++ b/pkg/apis/helpers/helpers.go @@ -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") diff --git a/pkg/apis/utils/utils.go b/pkg/apis/utils/utils.go index d7de08a34..fb4305388 100644 --- a/pkg/apis/utils/utils.go +++ b/pkg/apis/utils/utils.go @@ -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") diff --git a/pkg/cli/job/list.go b/pkg/cli/job/list.go index 49bc76826..ab2c96445 100644 --- a/pkg/cli/job/list.go +++ b/pkg/cli/job/list.go @@ -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 { diff --git a/pkg/cli/job/resume.go b/pkg/cli/job/resume.go index 2749e14dc..b5b98b73b 100644 --- a/pkg/cli/job/resume.go +++ b/pkg/cli/job/resume.go @@ -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 { diff --git a/pkg/cli/job/run.go b/pkg/cli/job/run.go index f28fe1da1..743a0c937 100644 --- a/pkg/cli/job/run.go +++ b/pkg/cli/job/run.go @@ -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 { diff --git a/pkg/cli/job/suspend.go b/pkg/cli/job/suspend.go index 1b4eafdaa..47431ab03 100644 --- a/pkg/cli/job/suspend.go +++ b/pkg/cli/job/suspend.go @@ -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 { diff --git a/pkg/cli/job/util.go b/pkg/cli/job/util.go index d00952028..a9ac71f31 100644 --- a/pkg/cli/job/util.go +++ b/pkg/cli/job/util.go @@ -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 { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index febf6a34a..2b71525f1 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -19,9 +19,9 @@ limitations under the License. package versioned import ( - batchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + batchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/batch/v1alpha1" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/bus/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 48adc190d..67abd106e 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - clientset "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - batchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" - fakebatchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" - fakebusv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - fakeschedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake" + clientset "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + batchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/batch/v1alpha1" + fakebatchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/bus/v1alpha1" + fakebusv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + fakeschedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 75f9f7590..aed5058b6 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - batchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + batchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 56cba7075..99be35a44 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -19,9 +19,9 @@ limitations under the License. package scheme import ( - batchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + batchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/batch/v1alpha1/batch_client.go b/pkg/client/clientset/versioned/typed/batch/v1alpha1/batch_client.go index 6707ab3ff..1b1367160 100644 --- a/pkg/client/clientset/versioned/typed/batch/v1alpha1/batch_client.go +++ b/pkg/client/clientset/versioned/typed/batch/v1alpha1/batch_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_batch_client.go b/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_batch_client.go index eb42df43f..50f7bea5a 100644 --- a/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_batch_client.go +++ b/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_batch_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/batch/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_job.go b/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_job.go index ddc678863..5a4efef50 100644 --- a/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_job.go +++ b/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake/fake_job.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/batch/v1alpha1/job.go b/pkg/client/clientset/versioned/typed/batch/v1alpha1/job.go index 40689efef..a1994ef6d 100644 --- a/pkg/client/clientset/versioned/typed/batch/v1alpha1/job.go +++ b/pkg/client/clientset/versioned/typed/batch/v1alpha1/job.go @@ -21,8 +21,8 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - scheme "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + scheme "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/bus/v1alpha1/bus_client.go b/pkg/client/clientset/versioned/typed/bus/v1alpha1/bus_client.go index b1eb58a7c..1d2355cf1 100644 --- a/pkg/client/clientset/versioned/typed/bus/v1alpha1/bus_client.go +++ b/pkg/client/clientset/versioned/typed/bus/v1alpha1/bus_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/bus/v1alpha1/command.go b/pkg/client/clientset/versioned/typed/bus/v1alpha1/command.go index 4988c998d..b8e98420d 100644 --- a/pkg/client/clientset/versioned/typed/bus/v1alpha1/command.go +++ b/pkg/client/clientset/versioned/typed/bus/v1alpha1/command.go @@ -21,8 +21,8 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - scheme "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + scheme "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_bus_client.go b/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_bus_client.go index 33f77595a..c6ed707bb 100644 --- a/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_bus_client.go +++ b/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_bus_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/bus/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_command.go b/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_command.go index 18775420f..676ca658a 100644 --- a/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_command.go +++ b/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake/fake_command.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podgroup.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podgroup.go index 84f98446c..5bc2cd95f 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/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-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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" 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 index 5d4b2bbb1..6b2fe2ea8 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_queue.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go index 3b2ae25e0..f8c9e918a 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go index b405d0254..0bfd5a6da 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podgroup.go @@ -21,8 +21,8 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - scheme "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + scheme "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go index c4f6c1ed7..6dea0f131 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/queue.go @@ -21,8 +21,8 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - scheme "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + scheme "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go index b2991c4d3..d57f01217 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/informers/externalversions/batch/interface.go b/pkg/client/informers/externalversions/batch/interface.go index 95502457b..0b58fa899 100644 --- a/pkg/client/informers/externalversions/batch/interface.go +++ b/pkg/client/informers/externalversions/batch/interface.go @@ -19,8 +19,8 @@ limitations under the License. package batch import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/batch/v1alpha1" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/batch/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/batch/v1alpha1/interface.go b/pkg/client/informers/externalversions/batch/v1alpha1/interface.go index 133b76c7a..11926df2a 100644 --- a/pkg/client/informers/externalversions/batch/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/batch/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/batch/v1alpha1/job.go b/pkg/client/informers/externalversions/batch/v1alpha1/job.go index ce269b19b..23051d23a 100644 --- a/pkg/client/informers/externalversions/batch/v1alpha1/job.go +++ b/pkg/client/informers/externalversions/batch/v1alpha1/job.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - batchv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/listers/batch/v1alpha1" + batchv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/batch/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/bus/interface.go b/pkg/client/informers/externalversions/bus/interface.go index cffbe2f48..cf47a5145 100644 --- a/pkg/client/informers/externalversions/bus/interface.go +++ b/pkg/client/informers/externalversions/bus/interface.go @@ -19,8 +19,8 @@ limitations under the License. package bus import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/bus/v1alpha1" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/bus/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/bus/v1alpha1/command.go b/pkg/client/informers/externalversions/bus/v1alpha1/command.go index 7f60b2d93..125ec35dc 100644 --- a/pkg/client/informers/externalversions/bus/v1alpha1/command.go +++ b/pkg/client/informers/externalversions/bus/v1alpha1/command.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/listers/bus/v1alpha1" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/bus/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/bus/v1alpha1/interface.go b/pkg/client/informers/externalversions/bus/v1alpha1/interface.go index 3f47ed166..5bec2c84f 100644 --- a/pkg/client/informers/externalversions/bus/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/bus/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 703d7bbb6..4fc2e121e 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,11 +23,11 @@ import ( sync "sync" time "time" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - batch "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/batch" - bus "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/bus" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - scheduling "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/scheduling" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + batch "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/batch" + bus "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/bus" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + scheduling "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index fb90e4e60..fca2b0690 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,9 +21,9 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + busv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 90d60cf55..35707ad01 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/informers/externalversions/scheduling/interface.go b/pkg/client/informers/externalversions/scheduling/interface.go index 257905b0f..0a73048e1 100644 --- a/pkg/client/informers/externalversions/scheduling/interface.go +++ b/pkg/client/informers/externalversions/scheduling/interface.go @@ -19,8 +19,8 @@ limitations under the License. package scheduling import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/scheduling/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/scheduling/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go index c3f145593..0194ac782 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go index 4866f7c31..c0c14f5d8 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/podgroup.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/listers/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go index faf775f9d..fb1d65648 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/queue.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - schedulingv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - versioned "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/listers/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + versioned "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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" diff --git a/pkg/client/informers/internalversion/factory.go b/pkg/client/informers/internalversion/factory.go index ec81d0ed9..755a23b7f 100644 --- a/pkg/client/informers/internalversion/factory.go +++ b/pkg/client/informers/internalversion/factory.go @@ -23,8 +23,8 @@ import ( sync "sync" time "time" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/internalinterfaces" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/internalinterfaces" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/internalversion/generic.go b/pkg/client/informers/internalversion/generic.go index 5c8729eb0..af0487c5a 100644 --- a/pkg/client/informers/internalversion/generic.go +++ b/pkg/client/informers/internalversion/generic.go @@ -21,7 +21,7 @@ package internalversion import ( "fmt" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/internalversion/v1alpha1/interface.go b/pkg/client/informers/internalversion/v1alpha1/interface.go index 2e0653b2f..6e565ec14 100644 --- a/pkg/client/informers/internalversion/v1alpha1/interface.go +++ b/pkg/client/informers/internalversion/v1alpha1/interface.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/internalinterfaces" - internalversion "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/v1alpha1/internalversion" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/internalinterfaces" + internalversion "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/v1alpha1/internalversion" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/internalversion/v1alpha1/internalversion/interface.go b/pkg/client/informers/internalversion/v1alpha1/internalversion/interface.go index 6956c99ca..f18657bb1 100644 --- a/pkg/client/informers/internalversion/v1alpha1/internalversion/interface.go +++ b/pkg/client/informers/internalversion/v1alpha1/internalversion/interface.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/internalinterfaces" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/internalversion/v1alpha1/internalversion/podgroup.go b/pkg/client/informers/internalversion/v1alpha1/internalversion/podgroup.go index 55ad066a2..86395b280 100644 --- a/pkg/client/informers/internalversion/v1alpha1/internalversion/podgroup.go +++ b/pkg/client/informers/internalversion/v1alpha1/internalversion/podgroup.go @@ -21,9 +21,9 @@ package internalversion import ( time "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/internalinterfaces" - internalversion "github.com/kubernetes-sigs/volcano/pkg/client/listers/v1alpha1/internalversion" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/internalinterfaces" + internalversion "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/v1alpha1/internalversion" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/internalversion/v1alpha1/internalversion/queue.go b/pkg/client/informers/internalversion/v1alpha1/internalversion/queue.go index fa011715f..bfff30c9d 100644 --- a/pkg/client/informers/internalversion/v1alpha1/internalversion/queue.go +++ b/pkg/client/informers/internalversion/v1alpha1/internalversion/queue.go @@ -21,9 +21,9 @@ package internalversion import ( time "time" - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - internalinterfaces "github.com/kubernetes-sigs/volcano/pkg/client/informers/internalversion/internalinterfaces" - internalversion "github.com/kubernetes-sigs/volcano/pkg/client/listers/v1alpha1/internalversion" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + internalinterfaces "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/internalversion/internalinterfaces" + internalversion "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/v1alpha1/internalversion" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/listers/batch/v1alpha1/job.go b/pkg/client/listers/batch/v1alpha1/job.go index 1e7391a30..880cbec6d 100644 --- a/pkg/client/listers/batch/v1alpha1/job.go +++ b/pkg/client/listers/batch/v1alpha1/job.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/bus/v1alpha1/command.go b/pkg/client/listers/bus/v1alpha1/command.go index 95803b73b..c91f57aac 100644 --- a/pkg/client/listers/bus/v1alpha1/command.go +++ b/pkg/client/listers/bus/v1alpha1/command.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/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/podgroup.go b/pkg/client/listers/scheduling/v1alpha1/podgroup.go index dbdef1329..28ad72a06 100644 --- a/pkg/client/listers/scheduling/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-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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 index 81edc79d2..7bdbdf91c 100644 --- a/pkg/client/listers/scheduling/v1alpha1/queue.go +++ b/pkg/client/listers/scheduling/v1alpha1/queue.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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/v1alpha1/internalversion/podgroup.go b/pkg/client/listers/v1alpha1/internalversion/podgroup.go index 4a0dd7f16..af4e1a780 100644 --- a/pkg/client/listers/v1alpha1/internalversion/podgroup.go +++ b/pkg/client/listers/v1alpha1/internalversion/podgroup.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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/v1alpha1/internalversion/queue.go b/pkg/client/listers/v1alpha1/internalversion/queue.go index 0f4d27dae..1c7d07785 100644 --- a/pkg/client/listers/v1alpha1/internalversion/queue.go +++ b/pkg/client/listers/v1alpha1/internalversion/queue.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - v1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kubernetes-sigs/kube-batch/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/controllers/apis/job_info.go b/pkg/controllers/apis/job_info.go index 57aea20c6..98d125c42 100644 --- a/pkg/controllers/apis/job_info.go +++ b/pkg/controllers/apis/job_info.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" - "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" ) // JobInfo has info about Job CRD diff --git a/pkg/controllers/cache/cache.go b/pkg/controllers/cache/cache.go index e76e1393d..c0931705c 100644 --- a/pkg/controllers/cache/cache.go +++ b/pkg/controllers/cache/cache.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" - "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type jobCache struct { diff --git a/pkg/controllers/cache/interface.go b/pkg/controllers/cache/interface.go index c5018dd4b..121767451 100644 --- a/pkg/controllers/cache/interface.go +++ b/pkg/controllers/cache/interface.go @@ -19,8 +19,8 @@ package cache import ( "k8s.io/api/core/v1" - "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) // Cache is an interface diff --git a/pkg/controllers/job/job_controller.go b/pkg/controllers/job/job_controller.go index e7a51be02..a42c8e80a 100644 --- a/pkg/controllers/job/job_controller.go +++ b/pkg/controllers/job/job_controller.go @@ -33,20 +33,20 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - v1corev1 "github.com/kubernetes-sigs/volcano/pkg/apis/bus/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/helpers" - vkclient "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - vkscheme "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" - vkinformers "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions" - vkbatchinformer "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/batch/v1alpha1" - vkbusinformer "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/bus/v1alpha1" - kbinfo "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/scheduling/v1alpha1" - vkbatchlister "github.com/kubernetes-sigs/volcano/pkg/client/listers/batch/v1alpha1" - vkbuslister "github.com/kubernetes-sigs/volcano/pkg/client/listers/bus/v1alpha1" - kblister "github.com/kubernetes-sigs/volcano/pkg/client/listers/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" - jobcache "github.com/kubernetes-sigs/volcano/pkg/controllers/cache" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/state" + v1corev1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/bus/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers" + vkclient "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + vkscheme "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" + vkinformers "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions" + vkbatchinformer "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/batch/v1alpha1" + vkbusinformer "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/bus/v1alpha1" + kbinfo "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/scheduling/v1alpha1" + vkbatchlister "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/batch/v1alpha1" + vkbuslister "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/bus/v1alpha1" + kblister "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" + jobcache "github.com/kubernetes-sigs/kube-batch/pkg/controllers/cache" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/state" ) // Controller the Job Controller type diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go index 08b4ba439..1c8aaf556 100644 --- a/pkg/controllers/job/job_controller_actions.go +++ b/pkg/controllers/job/job_controller_actions.go @@ -27,14 +27,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - admissioncontroller "github.com/kubernetes-sigs/volcano/pkg/admission" - vkbatchv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - vkv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/helpers" - kbv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" - vkjobhelpers "github.com/kubernetes-sigs/volcano/pkg/controllers/job/helpers" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/state" + admissioncontroller "github.com/kubernetes-sigs/kube-batch/pkg/admission" + vkbatchv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + vkv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers" + kbv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" + vkjobhelpers "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/state" ) func (cc *Controller) killJob(jobInfo *apis.JobInfo, nextState state.NextStateFn) error { diff --git a/pkg/controllers/job/job_controller_handler.go b/pkg/controllers/job/job_controller_handler.go index 2a67efbe2..900f1c627 100644 --- a/pkg/controllers/job/job_controller_handler.go +++ b/pkg/controllers/job/job_controller_handler.go @@ -27,10 +27,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/tools/cache" - vkbatchv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - kbtype "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" - vkcache "github.com/kubernetes-sigs/volcano/pkg/controllers/cache" + vkbatchv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + kbtype "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" + vkcache "github.com/kubernetes-sigs/kube-batch/pkg/controllers/cache" ) func (cc *Controller) addCommand(obj interface{}) { diff --git a/pkg/controllers/job/job_controller_plugins.go b/pkg/controllers/job/job_controller_plugins.go index 493efa9fa..958b1f9ad 100644 --- a/pkg/controllers/job/job_controller_plugins.go +++ b/pkg/controllers/job/job_controller_plugins.go @@ -23,9 +23,9 @@ import ( "k8s.io/api/core/v1" - vkv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - vkplugin "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins" - vkinterface "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/interface" + vkv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + vkplugin "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins" + vkinterface "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/interface" ) func (cc *Controller) pluginOnPodCreate(job *vkv1alpha1.Job, pod *v1.Pod) error { diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go index 5c8357a4c..cfd3d33a3 100644 --- a/pkg/controllers/job/job_controller_util.go +++ b/pkg/controllers/job/job_controller_util.go @@ -19,17 +19,17 @@ package job import ( "fmt" "github.com/golang/glog" - vkjobhelpers "github.com/kubernetes-sigs/volcano/pkg/controllers/job/helpers" + vkjobhelpers "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/helpers" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kbapi "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + kbapi "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" - admissioncontroller "github.com/kubernetes-sigs/volcano/pkg/admission" - vkv1alpha1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/helpers" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + admissioncontroller "github.com/kubernetes-sigs/kube-batch/pkg/admission" + vkv1alpha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) func eventKey(obj interface{}) interface{} { diff --git a/pkg/controllers/job/plugins/env/env.go b/pkg/controllers/job/plugins/env/env.go index cf020d3e0..9cf69be54 100644 --- a/pkg/controllers/job/plugins/env/env.go +++ b/pkg/controllers/job/plugins/env/env.go @@ -22,10 +22,10 @@ import ( "k8s.io/api/core/v1" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/helpers" - vkhelpers "github.com/kubernetes-sigs/volcano/pkg/controllers/job/helpers" - vkinterface "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/interface" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers" + vkhelpers "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/helpers" + vkinterface "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/interface" ) type envPlugin struct { diff --git a/pkg/controllers/job/plugins/factory.go b/pkg/controllers/job/plugins/factory.go index cf262ebe2..b15e0abd3 100644 --- a/pkg/controllers/job/plugins/factory.go +++ b/pkg/controllers/job/plugins/factory.go @@ -19,9 +19,9 @@ package plugins import ( "sync" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/env" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/interface" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/ssh" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/env" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/interface" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/ssh" ) func init() { diff --git a/pkg/controllers/job/plugins/interface/interface.go b/pkg/controllers/job/plugins/interface/interface.go index e71919840..355960377 100644 --- a/pkg/controllers/job/plugins/interface/interface.go +++ b/pkg/controllers/job/plugins/interface/interface.go @@ -20,7 +20,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" ) type PluginClientset struct { diff --git a/pkg/controllers/job/plugins/ssh/ssh.go b/pkg/controllers/job/plugins/ssh/ssh.go index 889f8b7a5..d3e6fdb09 100644 --- a/pkg/controllers/job/plugins/ssh/ssh.go +++ b/pkg/controllers/job/plugins/ssh/ssh.go @@ -30,10 +30,10 @@ import ( "k8s.io/api/core/v1" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/helpers" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/env" - vkinterface "github.com/kubernetes-sigs/volcano/pkg/controllers/job/plugins/interface" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/env" + vkinterface "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/plugins/interface" ) type sshPlugin struct { diff --git a/pkg/controllers/job/state/aborted.go b/pkg/controllers/job/state/aborted.go index 93b108dfd..cb4ff201a 100644 --- a/pkg/controllers/job/state/aborted.go +++ b/pkg/controllers/job/state/aborted.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type abortedState struct { diff --git a/pkg/controllers/job/state/aborting.go b/pkg/controllers/job/state/aborting.go index 54ad049f9..e9de69cee 100644 --- a/pkg/controllers/job/state/aborting.go +++ b/pkg/controllers/job/state/aborting.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type abortingState struct { diff --git a/pkg/controllers/job/state/completing.go b/pkg/controllers/job/state/completing.go index f19edc775..2aa465fde 100644 --- a/pkg/controllers/job/state/completing.go +++ b/pkg/controllers/job/state/completing.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type completingState struct { diff --git a/pkg/controllers/job/state/factory.go b/pkg/controllers/job/state/factory.go index 70eefb2da..879f1f227 100644 --- a/pkg/controllers/job/state/factory.go +++ b/pkg/controllers/job/state/factory.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) // NextStateFn returns jobState diff --git a/pkg/controllers/job/state/finished.go b/pkg/controllers/job/state/finished.go index f11bece33..d73a01169 100644 --- a/pkg/controllers/job/state/finished.go +++ b/pkg/controllers/job/state/finished.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type finishedState struct { diff --git a/pkg/controllers/job/state/pending.go b/pkg/controllers/job/state/pending.go index 82935d914..b307d6498 100644 --- a/pkg/controllers/job/state/pending.go +++ b/pkg/controllers/job/state/pending.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type pendingState struct { diff --git a/pkg/controllers/job/state/restarting.go b/pkg/controllers/job/state/restarting.go index eab28da63..94d6cb646 100644 --- a/pkg/controllers/job/state/restarting.go +++ b/pkg/controllers/job/state/restarting.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type restartingState struct { diff --git a/pkg/controllers/job/state/running.go b/pkg/controllers/job/state/running.go index 62fd63ec0..8565e0e6c 100644 --- a/pkg/controllers/job/state/running.go +++ b/pkg/controllers/job/state/running.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type runningState struct { diff --git a/pkg/controllers/job/state/terminating.go b/pkg/controllers/job/state/terminating.go index 7d0dacc1d..e8321d506 100644 --- a/pkg/controllers/job/state/terminating.go +++ b/pkg/controllers/job/state/terminating.go @@ -17,8 +17,8 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/apis" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/apis" ) type terminatingState struct { diff --git a/pkg/controllers/job/state/util.go b/pkg/controllers/job/state/util.go index 974485dd2..211017b97 100644 --- a/pkg/controllers/job/state/util.go +++ b/pkg/controllers/job/state/util.go @@ -17,7 +17,7 @@ limitations under the License. package state import ( - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" ) // TotalTasks returns total number of tasks in a job diff --git a/pkg/scheduler/actions/allocate/allocate.go b/pkg/scheduler/actions/allocate/allocate.go index e188219b5..df28d6aac 100644 --- a/pkg/scheduler/actions/allocate/allocate.go +++ b/pkg/scheduler/actions/allocate/allocate.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/util" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util" ) type allocateAction struct { diff --git a/pkg/scheduler/actions/allocate/allocate_test.go b/pkg/scheduler/actions/allocate/allocate_test.go index 54e52567b..db01dd561 100644 --- a/pkg/scheduler/actions/allocate/allocate_test.go +++ b/pkg/scheduler/actions/allocate/allocate_test.go @@ -30,13 +30,13 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" - kbv1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/drf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/proportion" + kbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/drf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/proportion" ) func buildResourceList(cpu string, memory string) v1.ResourceList { diff --git a/pkg/scheduler/actions/backfill/backfill.go b/pkg/scheduler/actions/backfill/backfill.go index 43c95d76f..920270351 100644 --- a/pkg/scheduler/actions/backfill/backfill.go +++ b/pkg/scheduler/actions/backfill/backfill.go @@ -19,8 +19,8 @@ package backfill import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) type backfillAction struct { diff --git a/pkg/scheduler/actions/factory.go b/pkg/scheduler/actions/factory.go index f2f45bf0b..827533b22 100644 --- a/pkg/scheduler/actions/factory.go +++ b/pkg/scheduler/actions/factory.go @@ -17,12 +17,12 @@ limitations under the License. package actions import ( - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/actions/allocate" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/actions/backfill" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/actions/preempt" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/actions/reclaim" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/allocate" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/backfill" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/preempt" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions/reclaim" ) func init() { diff --git a/pkg/scheduler/actions/preempt/preempt.go b/pkg/scheduler/actions/preempt/preempt.go index f445361ab..f76571dcd 100644 --- a/pkg/scheduler/actions/preempt/preempt.go +++ b/pkg/scheduler/actions/preempt/preempt.go @@ -21,10 +21,10 @@ import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/metrics" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/util" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/metrics" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util" ) type preemptAction struct { diff --git a/pkg/scheduler/actions/preempt/preempt_test.go b/pkg/scheduler/actions/preempt/preempt_test.go index a5db248f5..d4a7b24a7 100644 --- a/pkg/scheduler/actions/preempt/preempt_test.go +++ b/pkg/scheduler/actions/preempt/preempt_test.go @@ -19,9 +19,9 @@ package preempt import ( "testing" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/drf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/drf" ) func TestPreempt(t *testing.T) { diff --git a/pkg/scheduler/actions/reclaim/reclaim.go b/pkg/scheduler/actions/reclaim/reclaim.go index b4e4c1480..83ae3a1af 100644 --- a/pkg/scheduler/actions/reclaim/reclaim.go +++ b/pkg/scheduler/actions/reclaim/reclaim.go @@ -19,9 +19,9 @@ package reclaim import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/util" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util" ) type reclaimAction struct { diff --git a/pkg/scheduler/api/helpers/helpers.go b/pkg/scheduler/api/helpers/helpers.go index 8eb842e37..8b0dec0c0 100644 --- a/pkg/scheduler/api/helpers/helpers.go +++ b/pkg/scheduler/api/helpers/helpers.go @@ -19,7 +19,7 @@ package helpers import ( "math" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // Min is used to find the min of two resource types diff --git a/pkg/scheduler/api/job_info.go b/pkg/scheduler/api/job_info.go index fcd69fa70..0aefddfea 100644 --- a/pkg/scheduler/api/job_info.go +++ b/pkg/scheduler/api/job_info.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" ) // TaskID is UID type for Task diff --git a/pkg/scheduler/api/queue_info.go b/pkg/scheduler/api/queue_info.go index fafd7cb86..e0014c30a 100644 --- a/pkg/scheduler/api/queue_info.go +++ b/pkg/scheduler/api/queue_info.go @@ -19,7 +19,7 @@ package api import ( "k8s.io/apimachinery/pkg/types" - arbcorev1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" + arbcorev1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" ) // QueueID is UID type, serves as unique ID for each queue diff --git a/pkg/scheduler/cache/cache.go b/pkg/scheduler/cache/cache.go index b23f1bcc0..4d447ac2a 100644 --- a/pkg/scheduler/cache/cache.go +++ b/pkg/scheduler/cache/cache.go @@ -44,15 +44,15 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/scheduler/volumebinder" - "github.com/kubernetes-sigs/volcano/cmd/kube-batch/app/options" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - kbver "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" - kbschema "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned/scheme" - kbinfo "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions" - kbinfov1 "github.com/kubernetes-sigs/volcano/pkg/client/informers/externalversions/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - kbapi "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" + kbschema "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme" + kbinfo "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions" + kbinfov1 "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + kbapi "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) func init() { diff --git a/pkg/scheduler/cache/cache_test.go b/pkg/scheduler/cache/cache_test.go index 8c8101d1e..06486fd03 100644 --- a/pkg/scheduler/cache/cache_test.go +++ b/pkg/scheduler/cache/cache_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) func nodesEqual(l, r map[string]*api.NodeInfo) bool { diff --git a/pkg/scheduler/cache/event_handlers.go b/pkg/scheduler/cache/event_handlers.go index cfebe4957..971d385ac 100644 --- a/pkg/scheduler/cache/event_handlers.go +++ b/pkg/scheduler/cache/event_handlers.go @@ -29,9 +29,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - kbv1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/utils" - kbapi "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + kbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/utils" + kbapi "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) func isTerminated(status kbapi.TaskStatus) bool { diff --git a/pkg/scheduler/cache/interface.go b/pkg/scheduler/cache/interface.go index 9572fd4c6..1545b4dac 100644 --- a/pkg/scheduler/cache/interface.go +++ b/pkg/scheduler/cache/interface.go @@ -19,8 +19,8 @@ package cache import ( "k8s.io/api/core/v1" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // Cache collects pods/nodes/queues information diff --git a/pkg/scheduler/cache/util.go b/pkg/scheduler/cache/util.go index 4b7db3b8d..b92378ad1 100644 --- a/pkg/scheduler/cache/util.go +++ b/pkg/scheduler/cache/util.go @@ -20,9 +20,9 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/apis/utils" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/utils" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) const ( diff --git a/pkg/scheduler/framework/event.go b/pkg/scheduler/framework/event.go index 46499d46e..428f3ab4d 100644 --- a/pkg/scheduler/framework/event.go +++ b/pkg/scheduler/framework/event.go @@ -17,7 +17,7 @@ limitations under the License. package framework import ( - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // Event structure diff --git a/pkg/scheduler/framework/framework.go b/pkg/scheduler/framework/framework.go index 32c7559ab..79520ad0f 100644 --- a/pkg/scheduler/framework/framework.go +++ b/pkg/scheduler/framework/framework.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/metrics" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/metrics" ) // OpenSession start the session diff --git a/pkg/scheduler/framework/session.go b/pkg/scheduler/framework/session.go index 8904f17be..c1b4d049b 100644 --- a/pkg/scheduler/framework/session.go +++ b/pkg/scheduler/framework/session.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/metrics" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/metrics" ) // Session information for the current session diff --git a/pkg/scheduler/framework/session_plugins.go b/pkg/scheduler/framework/session_plugins.go index eeb2745e5..230844017 100644 --- a/pkg/scheduler/framework/session_plugins.go +++ b/pkg/scheduler/framework/session_plugins.go @@ -17,7 +17,7 @@ limitations under the License. package framework import ( - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // AddJobOrderFn add job order function diff --git a/pkg/scheduler/framework/statement.go b/pkg/scheduler/framework/statement.go index 7800eb4ee..8909081a0 100644 --- a/pkg/scheduler/framework/statement.go +++ b/pkg/scheduler/framework/statement.go @@ -19,7 +19,7 @@ package framework import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // Statement structure diff --git a/pkg/scheduler/plugins/conformance/conformance.go b/pkg/scheduler/plugins/conformance/conformance.go index 215b654bc..2a0e1e89e 100644 --- a/pkg/scheduler/plugins/conformance/conformance.go +++ b/pkg/scheduler/plugins/conformance/conformance.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/scheduling" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) type conformancePlugin struct { diff --git a/pkg/scheduler/plugins/defaults.go b/pkg/scheduler/plugins/defaults.go index 1ca6aea72..0eeab1afc 100644 --- a/pkg/scheduler/plugins/defaults.go +++ b/pkg/scheduler/plugins/defaults.go @@ -16,7 +16,7 @@ limitations under the License. package plugins -import "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" +import "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" // ApplyPluginConfDefaults sets option's filed to its default value if not set func ApplyPluginConfDefaults(option *conf.PluginOption) { diff --git a/pkg/scheduler/plugins/drf/drf.go b/pkg/scheduler/plugins/drf/drf.go index 7c1050587..50fb18893 100644 --- a/pkg/scheduler/plugins/drf/drf.go +++ b/pkg/scheduler/plugins/drf/drf.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api/helpers" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) var shareDelta = 0.000001 diff --git a/pkg/scheduler/plugins/factory.go b/pkg/scheduler/plugins/factory.go index 470bc28be..331b9db09 100644 --- a/pkg/scheduler/plugins/factory.go +++ b/pkg/scheduler/plugins/factory.go @@ -17,15 +17,15 @@ limitations under the License. package plugins import ( - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/conformance" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/drf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/gang" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/nodeorder" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/predicates" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/priority" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins/proportion" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/conformance" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/drf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/gang" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/nodeorder" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/predicates" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/priority" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins/proportion" ) func init() { diff --git a/pkg/scheduler/plugins/gang/gang.go b/pkg/scheduler/plugins/gang/gang.go index b3f3dc3e5..f1c707b09 100644 --- a/pkg/scheduler/plugins/gang/gang.go +++ b/pkg/scheduler/plugins/gang/gang.go @@ -24,10 +24,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/metrics" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/metrics" ) type gangPlugin struct { diff --git a/pkg/scheduler/plugins/nodeorder/nodeorder.go b/pkg/scheduler/plugins/nodeorder/nodeorder.go index 7d2b9313b..c9cb82fb8 100644 --- a/pkg/scheduler/plugins/nodeorder/nodeorder.go +++ b/pkg/scheduler/plugins/nodeorder/nodeorder.go @@ -28,8 +28,8 @@ import ( schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" "k8s.io/kubernetes/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) const ( diff --git a/pkg/scheduler/plugins/predicates/predicates.go b/pkg/scheduler/plugins/predicates/predicates.go index cd686e213..2db155ecc 100644 --- a/pkg/scheduler/plugins/predicates/predicates.go +++ b/pkg/scheduler/plugins/predicates/predicates.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) type predicatesPlugin struct { diff --git a/pkg/scheduler/plugins/priority/priority.go b/pkg/scheduler/plugins/priority/priority.go index 9bc69f211..8c14bcaf0 100644 --- a/pkg/scheduler/plugins/priority/priority.go +++ b/pkg/scheduler/plugins/priority/priority.go @@ -18,8 +18,8 @@ package priority import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) type priorityPlugin struct { diff --git a/pkg/scheduler/plugins/proportion/proportion.go b/pkg/scheduler/plugins/proportion/proportion.go index 5582c0d28..4c39c13fc 100644 --- a/pkg/scheduler/plugins/proportion/proportion.go +++ b/pkg/scheduler/plugins/proportion/proportion.go @@ -19,9 +19,9 @@ package proportion import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api/helpers" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) type proportionPlugin struct { diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 562d65b5d..308d6e781 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" - schedcache "github.com/kubernetes-sigs/volcano/pkg/scheduler/cache" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/metrics" + schedcache "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/metrics" ) // Scheduler watches for new unscheduled pods for kubebatch. It attempts to find diff --git a/pkg/scheduler/util.go b/pkg/scheduler/util.go index ae29697e3..bcfc84753 100644 --- a/pkg/scheduler/util.go +++ b/pkg/scheduler/util.go @@ -23,9 +23,9 @@ import ( "gopkg.in/yaml.v2" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/framework" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/plugins" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins" ) var defaultSchedulerConf = ` diff --git a/pkg/scheduler/util/priority_queue.go b/pkg/scheduler/util/priority_queue.go index 4d166e471..a1a12a1de 100644 --- a/pkg/scheduler/util/priority_queue.go +++ b/pkg/scheduler/util/priority_queue.go @@ -19,7 +19,7 @@ package util import ( "container/heap" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) //PriorityQueue implements a scheduling queue. diff --git a/pkg/scheduler/util/scheduler_helper.go b/pkg/scheduler/util/scheduler_helper.go index cf67ac4fb..2641ba6cc 100644 --- a/pkg/scheduler/util/scheduler_helper.go +++ b/pkg/scheduler/util/scheduler_helper.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/client-go/util/workqueue" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) // PredicateNodes returns nodes that fit task diff --git a/pkg/scheduler/util/scheduler_helper_test.go b/pkg/scheduler/util/scheduler_helper_test.go index 9f2c4041d..b2b10fe21 100644 --- a/pkg/scheduler/util/scheduler_helper_test.go +++ b/pkg/scheduler/util/scheduler_helper_test.go @@ -17,7 +17,7 @@ limitations under the License. package util import ( - "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" "reflect" "testing" ) diff --git a/pkg/scheduler/util_test.go b/pkg/scheduler/util_test.go index fac75e0fc..381ccffd3 100644 --- a/pkg/scheduler/util_test.go +++ b/pkg/scheduler/util_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - _ "github.com/kubernetes-sigs/volcano/pkg/scheduler/actions" - "github.com/kubernetes-sigs/volcano/pkg/scheduler/conf" + _ "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions" + "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" ) func TestLoadSchedulerConf(t *testing.T) { diff --git a/test/e2e/admission.go b/test/e2e/admission.go index 3f0fa692f..39d153ee1 100644 --- a/test/e2e/admission.go +++ b/test/e2e/admission.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/errors" - "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" ) var _ = Describe("Job E2E Test: Test Admission service", func() { diff --git a/test/e2e/command.go b/test/e2e/command.go index 07b50e678..cb54b9c18 100644 --- a/test/e2e/command.go +++ b/test/e2e/command.go @@ -26,8 +26,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ctlJob "github.com/kubernetes-sigs/volcano/pkg/cli/job" - jobUtil "github.com/kubernetes-sigs/volcano/pkg/controllers/job" + ctlJob "github.com/kubernetes-sigs/kube-batch/pkg/cli/job" + jobUtil "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job" ) var _ = Describe("Job E2E Test: Test Job Command", func() { diff --git a/test/e2e/job_error_handling.go b/test/e2e/job_error_handling.go index e2ddc2766..f8e310f2d 100644 --- a/test/e2e/job_error_handling.go +++ b/test/e2e/job_error_handling.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - jobutil "github.com/kubernetes-sigs/volcano/pkg/controllers/job" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + jobutil "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job" ) var _ = Describe("Job Error Handling", func() { diff --git a/test/e2e/job_plugins.go b/test/e2e/job_plugins.go index 978e5cd19..c740bf7a2 100644 --- a/test/e2e/job_plugins.go +++ b/test/e2e/job_plugins.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/helpers" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/helpers" ) var _ = Describe("Job E2E Test: Test Job Plugins", func() { diff --git a/test/e2e/kube-batch/util.go b/test/e2e/kube-batch/util.go index 33e8d30ad..49feb7296 100644 --- a/test/e2e/kube-batch/util.go +++ b/test/e2e/kube-batch/util.go @@ -41,9 +41,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - kbv1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - kbver "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - kbapi "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + kbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + kbapi "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" ) var oneMinute = 1 * time.Minute diff --git a/test/e2e/mpi.go b/test/e2e/mpi.go index 1f832dea3..6a2ee10c1 100644 --- a/test/e2e/mpi.go +++ b/test/e2e/mpi.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" ) var _ = Describe("MPI E2E Test", func() { diff --git a/test/e2e/util.go b/test/e2e/util.go index 5c65b3666..e0766ba36 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -39,13 +39,13 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - kbv1 "github.com/kubernetes-sigs/volcano/pkg/apis/scheduling/v1alpha1" - kbver "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - kbapi "github.com/kubernetes-sigs/volcano/pkg/scheduler/api" + kbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" + kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + kbapi "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api" - vkv1 "github.com/kubernetes-sigs/volcano/pkg/apis/batch/v1alpha1" - vkver "github.com/kubernetes-sigs/volcano/pkg/client/clientset/versioned" - "github.com/kubernetes-sigs/volcano/pkg/controllers/job/state" + vkv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/batch/v1alpha1" + vkver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned" + "github.com/kubernetes-sigs/kube-batch/pkg/controllers/job/state" ) var oneMinute = 1 * time.Minute