diff --git a/cmd/cli/job.go b/cmd/cli/job.go index 100b337768..28a2f5d398 100644 --- a/cmd/cli/job.go +++ b/cmd/cli/job.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "hpw.cloud/volcano/pkg/cli/job" + "volcano.sh/volcano/pkg/cli/job" ) func buildJobCmd() *cobra.Command { diff --git a/cmd/controllers/app/server.go b/cmd/controllers/app/server.go index 8d652321de..eb0583eda9 100644 --- a/cmd/controllers/app/server.go +++ b/cmd/controllers/app/server.go @@ -37,8 +37,8 @@ import ( "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" - "hpw.cloud/volcano/cmd/controllers/app/options" - "hpw.cloud/volcano/pkg/controllers/job" + "volcano.sh/volcano/cmd/controllers/app/options" + "volcano.sh/volcano/pkg/controllers/job" ) const ( diff --git a/cmd/controllers/main.go b/cmd/controllers/main.go index 0d608a202b..54ed1dfbab 100644 --- a/cmd/controllers/main.go +++ b/cmd/controllers/main.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/util/flag" - "hpw.cloud/volcano/cmd/controllers/app" - "hpw.cloud/volcano/cmd/controllers/app/options" + "volcano.sh/volcano/cmd/controllers/app" + "volcano.sh/volcano/cmd/controllers/app/options" ) var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes") diff --git a/cmd/deepcopy-gen/main.go b/cmd/deepcopy-gen/main.go index daacc06c45..7c6eb0567e 100644 --- a/cmd/deepcopy-gen/main.go +++ b/cmd/deepcopy-gen/main.go @@ -62,7 +62,7 @@ func main() { // Override defaults. arguments.OutputFileBaseName = "deepcopy_generated" - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "hpw.cloud/volcano/hack/boilerplate/boilerplate.go.txt") + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "volcano.sh/volcano/hack/boilerplate/boilerplate.go.txt") // Custom args. customArgs := &generators.CustomArgs{} diff --git a/cmd/scheduler/main.go b/cmd/scheduler/main.go index c318c9fda5..f779c403f0 100644 --- a/cmd/scheduler/main.go +++ b/cmd/scheduler/main.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/util/flag" - _ "hpw.cloud/volcano/pkg/scheduler/algorithm" + _ "volcano.sh/volcano/pkg/scheduler/algorithm" "github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app" "github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options" diff --git a/config/crds/batch_v1alpha1_job.yaml b/config/crds/batch_v1alpha1_job.yaml index 09f16ccd1a..e069176bcf 100644 --- a/config/crds/batch_v1alpha1_job.yaml +++ b/config/crds/batch_v1alpha1_job.yaml @@ -1,9 +1,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - name: jobs.batch.hpw.cloud + name: jobs.batch.volcano.sh spec: - group: batch.hpw.cloud + group: batch.volcano.sh names: kind: Job plural: jobs diff --git a/config/crds/bus_v1alpha1_command.yaml b/config/crds/bus_v1alpha1_command.yaml index 3a01e1c1de..e5b9b451a8 100644 --- a/config/crds/bus_v1alpha1_command.yaml +++ b/config/crds/bus_v1alpha1_command.yaml @@ -1,9 +1,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - name: commands.bus.hpw.cloud + name: commands.bus.volcano.sh spec: - group: bus.hpw.cloud + group: bus.volcano.sh names: kind: Command plural: commands diff --git a/example/job.yaml b/example/job.yaml index 0deb143200..e4876a89c5 100644 --- a/example/job.yaml +++ b/example/job.yaml @@ -1,4 +1,4 @@ -apiVersion: batch.hpw.cloud/v1alpha1 +apiVersion: batch.volcano.sh/v1alpha1 kind: Job metadata: name: test-job diff --git a/pkg/apis/batch/v1alpha1/labels.go b/pkg/apis/batch/v1alpha1/labels.go index b3a788153e..c08b32f0d0 100644 --- a/pkg/apis/batch/v1alpha1/labels.go +++ b/pkg/apis/batch/v1alpha1/labels.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 const ( - TaskSpecKey = "hpw.cloud/task-spec" - JobNameKey = "hpw.cloud/job-name" - JobNamespaceKey = "hpw.cloud/job-namespace" + TaskSpecKey = "volcano.sh/task-spec" + JobNameKey = "volcano.sh/job-name" + JobNamespaceKey = "volcano.sh/job-namespace" DefaultTaskSpec = "default" ) diff --git a/pkg/apis/batch/v1alpha1/register.go b/pkg/apis/batch/v1alpha1/register.go index b9fefbb67e..0c5b9e96fd 100644 --- a/pkg/apis/batch/v1alpha1/register.go +++ b/pkg/apis/batch/v1alpha1/register.go @@ -28,7 +28,7 @@ var ( ) // GroupName is the group name used in this package. -const GroupName = "batch.hpw.cloud" +const GroupName = "batch.volcano.sh" // SchemeGroupVersion is the group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/apis/bus/v1alpha1/register.go b/pkg/apis/bus/v1alpha1/register.go index c7320d61a4..5c03343078 100644 --- a/pkg/apis/bus/v1alpha1/register.go +++ b/pkg/apis/bus/v1alpha1/register.go @@ -28,7 +28,7 @@ var ( ) // GroupName is the group name used in this package. -const GroupName = "bus.hpw.cloud" +const GroupName = "bus.volcano.sh" // SchemeGroupVersion is the group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/apis/helpers/helpers.go b/pkg/apis/helpers/helpers.go index 11854b8c53..c40905a955 100644 --- a/pkg/apis/helpers/helpers.go +++ b/pkg/apis/helpers/helpers.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - vkbatchv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - vkcorev1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + vkcorev1 "volcano.sh/volcano/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 1e2ac6d56e..956b5a78cc 100644 --- a/pkg/cli/job/list.go +++ b/pkg/cli/job/list.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "hpw.cloud/volcano/pkg/client/clientset/versioned" + "volcano.sh/volcano/pkg/client/clientset/versioned" ) type listFlags struct { diff --git a/pkg/cli/job/resume.go b/pkg/cli/job/resume.go index ae618672e3..309c7d9902 100644 --- a/pkg/cli/job/resume.go +++ b/pkg/cli/job/resume.go @@ -18,7 +18,7 @@ package job import ( "github.com/spf13/cobra" - "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/apis/batch/v1alpha1" ) type resumeFlags struct { diff --git a/pkg/cli/job/run.go b/pkg/cli/job/run.go index c0b4c3b684..5635b23b66 100644 --- a/pkg/cli/job/run.go +++ b/pkg/cli/job/run.go @@ -21,8 +21,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vkapi "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/client/clientset/versioned" + vkapi "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/client/clientset/versioned" ) type runFlags struct { @@ -50,7 +50,7 @@ func InitRunFlags(cmd *cobra.Command) { cmd.Flags().StringVarP(&launchJobFlags.Requests, "requests", "", "cpu=1000m,memory=100Mi", "the resource request of the task") } -var jobName = "job.volcano.hpw.cloud" +var jobName = "job.volcano.volcano.sh" func RunJob() error { config, err := buildConfig(launchJobFlags.Master, launchJobFlags.Kubeconfig) diff --git a/pkg/cli/job/suspend.go b/pkg/cli/job/suspend.go index 51ee52eb5d..1eb8a492e1 100644 --- a/pkg/cli/job/suspend.go +++ b/pkg/cli/job/suspend.go @@ -18,7 +18,7 @@ package job import ( "github.com/spf13/cobra" - "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/apis/batch/v1alpha1" ) type suspendFlags struct { diff --git a/pkg/cli/job/util.go b/pkg/cli/job/util.go index 05c7d0e2b7..a3c919e609 100644 --- a/pkg/cli/job/util.go +++ b/pkg/cli/job/util.go @@ -27,10 +27,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - vkbatchv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - vkbusv1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - "hpw.cloud/volcano/pkg/apis/helpers" - "hpw.cloud/volcano/pkg/client/clientset/versioned" + vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + vkbusv1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + "volcano.sh/volcano/pkg/apis/helpers" + "volcano.sh/volcano/pkg/client/clientset/versioned" ) func homeDir() string { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index a5bd3a96a7..4a6ccb0958 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - batchv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" - busv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" + batchv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" + busv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/bus/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 200ff4b499..f7aea02006 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,11 +19,11 @@ limitations under the License. package fake import ( - clientset "hpw.cloud/volcano/pkg/client/clientset/versioned" - batchv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" - fakebatchv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake" - busv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" - fakebusv1alpha1 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1/fake" + clientset "volcano.sh/volcano/pkg/client/clientset/versioned" + batchv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" + fakebatchv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1/fake" + busv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" + fakebusv1alpha1 "volcano.sh/volcano/pkg/client/clientset/versioned/typed/bus/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 042fc724f3..c066e79259 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( - batchv1alpha1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + batchv1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + busv1alpha1 "volcano.sh/volcano/pkg/apis/bus/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 cf319718be..8b7cd60d9b 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -19,8 +19,8 @@ limitations under the License. package scheme import ( - batchv1alpha1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + batchv1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + busv1alpha1 "volcano.sh/volcano/pkg/apis/bus/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 a079f488bc..6bcff17360 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/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 1bc2b5754e..202e069fd1 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 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/batch/v1alpha1" + v1alpha1 "volcano.sh/volcano/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 d02c37149e..3b29cb8644 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + v1alpha1 "volcano.sh/volcano/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 2e962e278a..259dd4d082 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - scheme "hpw.cloud/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + scheme "volcano.sh/volcano/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 73e36f5bd8..f55ced0107 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 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - "hpw.cloud/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + "volcano.sh/volcano/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 9f9a1a3045..6a0b1392bf 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 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - scheme "hpw.cloud/volcano/pkg/client/clientset/versioned/scheme" + v1alpha1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + scheme "volcano.sh/volcano/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 9fc41d974f..b35cbc3651 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 "hpw.cloud/volcano/pkg/client/clientset/versioned/typed/bus/v1alpha1" + v1alpha1 "volcano.sh/volcano/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 9ca688ee07..e927b2e0e6 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 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + v1alpha1 "volcano.sh/volcano/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/informers/externalversions/batch/interface.go b/pkg/client/informers/externalversions/batch/interface.go index 117c973458..fd5bd247c5 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 "hpw.cloud/volcano/pkg/client/informers/externalversions/batch/v1alpha1" - internalinterfaces "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "volcano.sh/volcano/pkg/client/informers/externalversions/batch/v1alpha1" + internalinterfaces "volcano.sh/volcano/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 8c6f2b2fa6..62993644c7 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 "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "volcano.sh/volcano/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 f0d98ce181..5f0de0ada1 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - versioned "hpw.cloud/volcano/pkg/client/clientset/versioned" - internalinterfaces "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "hpw.cloud/volcano/pkg/client/listers/batch/v1alpha1" + batchv1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + versioned "volcano.sh/volcano/pkg/client/clientset/versioned" + internalinterfaces "volcano.sh/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "volcano.sh/volcano/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 15f65c76d6..71cf1fb3eb 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 "hpw.cloud/volcano/pkg/client/informers/externalversions/bus/v1alpha1" - internalinterfaces "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "volcano.sh/volcano/pkg/client/informers/externalversions/bus/v1alpha1" + internalinterfaces "volcano.sh/volcano/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 8940112bc1..3350ce62ec 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 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - versioned "hpw.cloud/volcano/pkg/client/clientset/versioned" - internalinterfaces "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "hpw.cloud/volcano/pkg/client/listers/bus/v1alpha1" + busv1alpha1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + versioned "volcano.sh/volcano/pkg/client/clientset/versioned" + internalinterfaces "volcano.sh/volcano/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "volcano.sh/volcano/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 0d7a883808..a151bced60 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 "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "volcano.sh/volcano/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 ffd4fe18d1..ae42554f85 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,10 +23,10 @@ import ( sync "sync" time "time" - versioned "hpw.cloud/volcano/pkg/client/clientset/versioned" - batch "hpw.cloud/volcano/pkg/client/informers/externalversions/batch" - bus "hpw.cloud/volcano/pkg/client/informers/externalversions/bus" - internalinterfaces "hpw.cloud/volcano/pkg/client/informers/externalversions/internalinterfaces" + versioned "volcano.sh/volcano/pkg/client/clientset/versioned" + batch "volcano.sh/volcano/pkg/client/informers/externalversions/batch" + bus "volcano.sh/volcano/pkg/client/informers/externalversions/bus" + internalinterfaces "volcano.sh/volcano/pkg/client/informers/externalversions/internalinterfaces" 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 b447ff6063..e3fc754615 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,8 +21,8 @@ package externalversions import ( "fmt" - v1alpha1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - busv1alpha1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + v1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + busv1alpha1 "volcano.sh/volcano/pkg/apis/bus/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 174b92767d..1e7b8e4a03 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 "hpw.cloud/volcano/pkg/client/clientset/versioned" + versioned "volcano.sh/volcano/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/listers/batch/v1alpha1/job.go b/pkg/client/listers/batch/v1alpha1/job.go index 30b1766ebc..c56e9ea0b5 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + v1alpha1 "volcano.sh/volcano/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 3c1e1f4044..7742aa09d1 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 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" + v1alpha1 "volcano.sh/volcano/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/controllers/job/apis/types.go b/pkg/controllers/job/apis/types.go index c1c1583f53..af7aef6f2b 100644 --- a/pkg/controllers/job/apis/types.go +++ b/pkg/controllers/job/apis/types.go @@ -19,7 +19,7 @@ package apis import ( "k8s.io/api/core/v1" - vkbatchv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" ) type JobInfo struct { diff --git a/pkg/controllers/job/cache/cache.go b/pkg/controllers/job/cache/cache.go index 3ea1681997..62fa87e134 100644 --- a/pkg/controllers/job/cache/cache.go +++ b/pkg/controllers/job/cache/cache.go @@ -26,8 +26,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" - "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type Cache interface { diff --git a/pkg/controllers/job/job_controller.go b/pkg/controllers/job/job_controller.go index 71bf636348..0dffd34edf 100644 --- a/pkg/controllers/job/job_controller.go +++ b/pkg/controllers/job/job_controller.go @@ -37,17 +37,17 @@ import ( kbinfo "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/externalversions/scheduling/v1alpha1" kblister "github.com/kubernetes-sigs/kube-batch/pkg/client/listers/scheduling/v1alpha1" - v1corev1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - "hpw.cloud/volcano/pkg/apis/helpers" - vkver "hpw.cloud/volcano/pkg/client/clientset/versioned" - vkinfoext "hpw.cloud/volcano/pkg/client/informers/externalversions" - vkbatchinfo "hpw.cloud/volcano/pkg/client/informers/externalversions/batch/v1alpha1" - vkcoreinfo "hpw.cloud/volcano/pkg/client/informers/externalversions/bus/v1alpha1" - vkbatchlister "hpw.cloud/volcano/pkg/client/listers/batch/v1alpha1" - vkcorelister "hpw.cloud/volcano/pkg/client/listers/bus/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" - jobcache "hpw.cloud/volcano/pkg/controllers/job/cache" - "hpw.cloud/volcano/pkg/controllers/job/state" + v1corev1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + "volcano.sh/volcano/pkg/apis/helpers" + vkver "volcano.sh/volcano/pkg/client/clientset/versioned" + vkinfoext "volcano.sh/volcano/pkg/client/informers/externalversions" + vkbatchinfo "volcano.sh/volcano/pkg/client/informers/externalversions/batch/v1alpha1" + vkcoreinfo "volcano.sh/volcano/pkg/client/informers/externalversions/bus/v1alpha1" + vkbatchlister "volcano.sh/volcano/pkg/client/listers/batch/v1alpha1" + vkcorelister "volcano.sh/volcano/pkg/client/listers/bus/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" + jobcache "volcano.sh/volcano/pkg/controllers/job/cache" + "volcano.sh/volcano/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 b60f160269..c8b878e391 100644 --- a/pkg/controllers/job/job_controller_actions.go +++ b/pkg/controllers/job/job_controller_actions.go @@ -27,10 +27,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vkv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/apis/helpers" - "hpw.cloud/volcano/pkg/controllers/job/apis" - "hpw.cloud/volcano/pkg/controllers/job/state" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/apis/helpers" + "volcano.sh/volcano/pkg/controllers/job/apis" + "volcano.sh/volcano/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 16d1f5d6a5..778f3f4ade 100644 --- a/pkg/controllers/job/job_controller_handler.go +++ b/pkg/controllers/job/job_controller_handler.go @@ -22,9 +22,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" - vkbatchv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - vkbusv1 "hpw.cloud/volcano/pkg/apis/bus/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + vkbusv1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) func (cc *Controller) addCommand(obj interface{}) { diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go index 51177ff673..f24d3d7457 100644 --- a/pkg/controllers/job/job_controller_util.go +++ b/pkg/controllers/job/job_controller_util.go @@ -24,9 +24,9 @@ import ( kbapi "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" - vkv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/apis/helpers" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/apis/helpers" + "volcano.sh/volcano/pkg/controllers/job/apis" ) func validate(job *vkv1.Job) error { diff --git a/pkg/controllers/job/state/aborted.go b/pkg/controllers/job/state/aborted.go index a701e3623b..8da034799f 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type abortedState struct { diff --git a/pkg/controllers/job/state/aborting.go b/pkg/controllers/job/state/aborting.go index d0d6f2f2e6..f0e6d38546 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type abortingState struct { diff --git a/pkg/controllers/job/state/factory.go b/pkg/controllers/job/state/factory.go index cc8b1c1dbe..be740b3ca4 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type NextStateFn func(status vkv1.JobStatus) vkv1.JobState diff --git a/pkg/controllers/job/state/finished.go b/pkg/controllers/job/state/finished.go index 1d13c3f359..61db953570 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type finishedState struct { diff --git a/pkg/controllers/job/state/pending.go b/pkg/controllers/job/state/pending.go index b730d8d683..270069e421 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type pendingState struct { diff --git a/pkg/controllers/job/state/restarting.go b/pkg/controllers/job/state/restarting.go index 1e46882454..681aa01da5 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type restartingState struct { diff --git a/pkg/controllers/job/state/running.go b/pkg/controllers/job/state/running.go index 814015dc31..9671e86b35 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type runningState struct { diff --git a/pkg/controllers/job/state/terminating.go b/pkg/controllers/job/state/terminating.go index 01ba667217..b81ca4641c 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - "hpw.cloud/volcano/pkg/controllers/job/apis" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + "volcano.sh/volcano/pkg/controllers/job/apis" ) type terminatingState struct { diff --git a/pkg/controllers/job/state/util.go b/pkg/controllers/job/state/util.go index 6eacf590eb..45277ef640 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 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" ) func totalTasks(job *vkv1.Job) int32 { diff --git a/pkg/scheduler/algorithm/factory.go b/pkg/scheduler/algorithm/factory.go index e15c3f5f86..110aea4f25 100644 --- a/pkg/scheduler/algorithm/factory.go +++ b/pkg/scheduler/algorithm/factory.go @@ -17,7 +17,7 @@ limitations under the License. package algorithm import ( - "hpw.cloud/volcano/pkg/scheduler/algorithm/fairshare" + "volcano.sh/volcano/pkg/scheduler/algorithm/fairshare" "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework" ) diff --git a/test/e2e/util.go b/test/e2e/util.go index 59abdd7136..a10ef3473f 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -39,8 +39,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - vkv1 "hpw.cloud/volcano/pkg/apis/batch/v1alpha1" - vkver "hpw.cloud/volcano/pkg/client/clientset/versioned" + vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1" + vkver "volcano.sh/volcano/pkg/client/clientset/versioned" kbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1" kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"