Skip to content

Commit aec87f6

Browse files
kevin-wangzefengkevin-wangzefeng
committed
update scheduler import paths to volcano and fix building
1 parent 471b543 commit aec87f6

File tree

85 files changed

+1538
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1538
-178
lines changed

‎cmd/admission/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"net/http"
2424

2525
"github.com/golang/glog"
26-
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
26+
"volcano.sh/volcano/pkg/client/clientset/versioned"
2727

2828
"k8s.io/api/admission/v1beta1"
2929
"k8s.io/apimachinery/pkg/runtime"

‎cmd/controllers/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"k8s.io/client-go/tools/leaderelection/resourcelock"
3939
"k8s.io/client-go/tools/record"
4040

41-
kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
41+
kbver "volcano.sh/volcano/pkg/client/clientset/versioned"
4242

4343
"volcano.sh/volcano/cmd/controllers/app/options"
4444
vkclient "volcano.sh/volcano/pkg/client/clientset/versioned"

‎cmd/kube-batch/app/server.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"time"
2525

2626
"github.com/golang/glog"
27-
"github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options"
28-
"github.com/kubernetes-sigs/kube-batch/pkg/scheduler"
29-
"github.com/kubernetes-sigs/kube-batch/pkg/version"
27+
"volcano.sh/volcano/cmd/kube-batch/app/options"
28+
"volcano.sh/volcano/pkg/scheduler"
29+
"volcano.sh/volcano/pkg/version"
3030
"github.com/prometheus/client_golang/prometheus/promhttp"
3131

3232
v1 "k8s.io/api/core/v1"
@@ -75,7 +75,7 @@ func buildConfig(opt *options.ServerOption) (*rest.Config, error) {
7575
// Run the kubeBatch scheduler
7676
func Run(opt *options.ServerOption) error {
7777
if opt.PrintVersion {
78-
version.PrintVersionAndExit(apiVersion)
78+
version.PrintVersionAndExit()
7979
}
8080

8181
config, err := buildConfig(opt)

‎cmd/kube-batch/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/apiserver/pkg/util/flag"
3232

33-
"github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app"
34-
"github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options"
33+
"volcano.sh/volcano/cmd/kube-batch/app"
34+
"volcano.sh/volcano/cmd/kube-batch/app/options"
3535

3636
// Import default actions/plugins.
37-
_ "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions"
38-
_ "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/plugins"
37+
_ "volcano.sh/volcano/pkg/scheduler/actions"
38+
_ "volcano.sh/volcano/pkg/scheduler/plugins"
3939

4040
// init assert
41-
_ "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/util/assert"
41+
_ "volcano.sh/volcano/pkg/scheduler/util/assert"
4242
)
4343

4444
var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")

‎hack/update-gencode.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-ge
2929
# instead of the $GOPATH directly. For normal projects this can be dropped.
3030
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
3131
volcano.sh/volcano/pkg/client volcano.sh/volcano/pkg/apis \
32-
"batch:v1alpha1 bus:v1alpha1" \
32+
"batch:v1alpha1 bus:v1alpha1 scheduling:v1alpha1" \
3333
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate/boilerplate.go.txt
3434

3535
# To use your own boilerplate text use:

‎pkg/admission/admit_job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/golang/glog"
24-
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
24+
"volcano.sh/volcano/pkg/client/clientset/versioned"
2525

2626
"k8s.io/api/admission/v1beta1"
2727
"k8s.io/api/core/v1"

‎pkg/admission/admit_job_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"strings"
2121
"testing"
2222

23-
kubebatchclient "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/fake"
23+
kubebatchclient "volcano.sh/volcano/pkg/client/clientset/versioned/fake"
2424

2525
"k8s.io/api/admission/v1beta1"
2626
v1 "k8s.io/api/core/v1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828

29-
kbv1aplha1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
29+
kbv1aplha1 "volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
3030
v1alpha1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
3131
)
3232

‎pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/cli/queue/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

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

24-
vkapi "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
25-
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
24+
vkapi "volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
25+
"volcano.sh/volcano/pkg/client/clientset/versioned"
2626
)
2727

2828
type createFlags struct {

‎pkg/cli/queue/get.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/spf13/cobra"
2525

26-
"github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
27-
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
26+
"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
27+
"volcano.sh/volcano/pkg/client/clientset/versioned"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
)
3030

‎pkg/cli/queue/list.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/spf13/cobra"
2525

26-
"github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
27-
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
26+
"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
27+
"volcano.sh/volcano/pkg/client/clientset/versioned"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
)
3030

‎pkg/cli/queue/queue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"net/http/httptest"
2424
"testing"
2525

26-
"github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
26+
"volcano.sh/volcano/pkg/apis/scheduling/v1alpha1"
2727
"github.com/spf13/cobra"
2828
"k8s.io/apimachinery/pkg/apis/meta/v1"
2929
)

‎pkg/client/clientset/versioned/clientset.go

+24-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/fake/clientset_generated.go

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/fake/register.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/scheme/register.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/scheduling/v1alpha1/doc.go

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/doc.go

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)