File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3939GOARCH =$(shell go env GOARCH)
4040GOOS =$(shell go env GOOS)
4141# Use go.mod go version as a single source of truth of scheduler-plugins version.
42- SCHEDULER_PLUGINS_VERSION? =$(shell awk '/scheduler-plugins/{print $$2}' go.mod|head -n1 )
42+ SCHEDULER_PLUGINS_VERSION? =$(shell go list -m -f "{{.Version}}" sigs.k8s.io/scheduler-plugins )
4343VOLCANO_SCHEDULER_VERSION? =$(shell go list -m -f "{{.Version}}" volcano.sh/apis)
4444
4545CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ require (
1717 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
1818 k8s.io/utils v0.0.0-20230209194617-a36077c30491
1919 sigs.k8s.io/controller-runtime v0.15.1
20- sigs.k8s.io/scheduler-plugins v0.25 .7
20+ sigs.k8s.io/scheduler-plugins v0.26 .7
2121 sigs.k8s.io/structured-merge-diff/v4 v4.2.3
2222 volcano.sh/apis v1.7.0
2323)
Original file line number Diff line number Diff line change @@ -689,8 +689,8 @@ sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUT
689689sigs.k8s.io/controller-runtime v0.15.1 /go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk =
690690sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo =
691691sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd /go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0 =
692- sigs.k8s.io/scheduler-plugins v0.25 .7 h1:2qSTXfHmzfFZJF9M9UHLiDXGdDXX+sUs/cn0dHbc4qk =
693- sigs.k8s.io/scheduler-plugins v0.25 .7 /go.mod h1:CKgZ1xu9WZdB3CMSzOjro/rtrBY/bQWMf6un2M9VNS4 =
692+ sigs.k8s.io/scheduler-plugins v0.26 .7 h1:GW7UN2cbqgdAWEjwmhM3iJFTVmhtC1jQ++UnUByYFyw =
693+ sigs.k8s.io/scheduler-plugins v0.26 .7 /go.mod h1:EUJPaj+L54KGwV0D018nfyfzjf5WLOM8uU+TOZpv9tI =
694694sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE =
695695sigs.k8s.io/structured-merge-diff/v4 v4.2.3 /go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E =
696696sigs.k8s.io/yaml v1.2.0 /go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc =
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ const (
6161 volcanoSchedulerManifestPath = rootPath + "/dep-manifests/volcano-scheduler/" // all in one yaml of volcano-development.yaml
6262 envUseExistingSchedulerPlugins = "USE_EXISTING_SCHEDULER_PLUGINS"
6363 envUseExistingVolcanoScheduler = "USE_EXISTING_VOLCANO_SCHEDULER"
64- defaultSchedulerPluginsVersion = "v0.25 .7"
64+ defaultSchedulerPluginsVersion = "v0.26 .7"
6565 defaultVolcanoSchedulerVersion = "v1.7.0"
6666
6767 mpiOperator = "mpi-operator"
@@ -183,7 +183,7 @@ func installOperator() error {
183183
184184func installSchedulerPlugins () error {
185185 // TODO: Remove flags to overwrite images once the scheduler-plugins with the appropriate helm charts is released.
186- // In the specific scheudler-plugins version such as v0.25 .7, manifests are incorrect.
186+ // In the specific scheudler-plugins version such as v0.26 .7, manifests are incorrect.
187187 // So we overwrite images.
188188 overwriteControllerImage := fmt .Sprintf ("controller.image=registry.k8s.io/scheduler-plugins/controller:%s" , schedulerPluginsVersion )
189189 overwriteSchedulerImage := fmt .Sprintf ("scheduler.image=registry.k8s.io/scheduler-plugins/kube-scheduler:%s" , schedulerPluginsVersion )
You can’t perform that action at this time.
0 commit comments