From 6bce22d1ab3a42e7ea52ef573afbc662a49c18a5 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Wed, 9 Aug 2023 03:30:56 +0900 Subject: [PATCH] Upgrade scheduler-plugins to v0.26.7 (#585) Signed-off-by: Yuki Iwai --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- test/e2e/e2e_suite_test.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 32cf9655..4ccaf15d 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) GOARCH=$(shell go env GOARCH) GOOS=$(shell go env GOOS) # Use go.mod go version as a single source of truth of scheduler-plugins version. -SCHEDULER_PLUGINS_VERSION?=$(shell awk '/scheduler-plugins/{print $$2}' go.mod|head -n1) +SCHEDULER_PLUGINS_VERSION?=$(shell go list -m -f "{{.Version}}" sigs.k8s.io/scheduler-plugins) VOLCANO_SCHEDULER_VERSION?=$(shell go list -m -f "{{.Version}}" volcano.sh/apis) CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true" diff --git a/go.mod b/go.mod index 5e32786f..8b40d07b 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/controller-runtime v0.15.1 - sigs.k8s.io/scheduler-plugins v0.25.7 + sigs.k8s.io/scheduler-plugins v0.26.7 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 volcano.sh/apis v1.7.0 ) diff --git a/go.sum b/go.sum index b20f8dce..f19c5aad 100644 --- a/go.sum +++ b/go.sum @@ -689,8 +689,8 @@ sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUT sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/scheduler-plugins v0.25.7 h1:2qSTXfHmzfFZJF9M9UHLiDXGdDXX+sUs/cn0dHbc4qk= -sigs.k8s.io/scheduler-plugins v0.25.7/go.mod h1:CKgZ1xu9WZdB3CMSzOjro/rtrBY/bQWMf6un2M9VNS4= +sigs.k8s.io/scheduler-plugins v0.26.7 h1:GW7UN2cbqgdAWEjwmhM3iJFTVmhtC1jQ++UnUByYFyw= +sigs.k8s.io/scheduler-plugins v0.26.7/go.mod h1:EUJPaj+L54KGwV0D018nfyfzjf5WLOM8uU+TOZpv9tI= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 66e0636b..022b21e0 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -61,7 +61,7 @@ const ( volcanoSchedulerManifestPath = rootPath + "/dep-manifests/volcano-scheduler/" // all in one yaml of volcano-development.yaml envUseExistingSchedulerPlugins = "USE_EXISTING_SCHEDULER_PLUGINS" envUseExistingVolcanoScheduler = "USE_EXISTING_VOLCANO_SCHEDULER" - defaultSchedulerPluginsVersion = "v0.25.7" + defaultSchedulerPluginsVersion = "v0.26.7" defaultVolcanoSchedulerVersion = "v1.7.0" mpiOperator = "mpi-operator" @@ -183,7 +183,7 @@ func installOperator() error { func installSchedulerPlugins() error { // TODO: Remove flags to overwrite images once the scheduler-plugins with the appropriate helm charts is released. - // In the specific scheudler-plugins version such as v0.25.7, manifests are incorrect. + // In the specific scheudler-plugins version such as v0.26.7, manifests are incorrect. // So we overwrite images. overwriteControllerImage := fmt.Sprintf("controller.image=registry.k8s.io/scheduler-plugins/controller:%s", schedulerPluginsVersion) overwriteSchedulerImage := fmt.Sprintf("scheduler.image=registry.k8s.io/scheduler-plugins/kube-scheduler:%s", schedulerPluginsVersion)