Skip to content

Commit

Permalink
Merge pull request #1 from volcano-sh/rename/volcano.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyLike authored Mar 15, 2019
2 parents 26127b5 + 75307d6 commit b8f1cdb
Show file tree
Hide file tree
Showing 57 changed files with 119 additions and 119 deletions.
2 changes: 1 addition & 1 deletion cmd/cli/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cmd/controllers/app/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/controllers/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion cmd/deepcopy-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion cmd/scheduler/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions config/crds/batch_v1alpha1_job.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crds/bus_v1alpha1_command.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/job.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: batch.hpw.cloud/v1alpha1
apiVersion: batch.volcano.sh/v1alpha1
kind: Job
metadata:
name: test-job
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/batch/v1alpha1/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion pkg/apis/batch/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/bus/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/job/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/job/resume.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cli/job/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/job/suspend.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions pkg/cli/job/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/clientset.go

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

10 changes: 5 additions & 5 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

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

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/fake/register.go

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

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/scheme/register.go

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

8 changes: 4 additions & 4 deletions pkg/client/informers/externalversions/factory.go

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

Loading

0 comments on commit b8f1cdb

Please sign in to comment.