Skip to content

Commit 2df0762

Browse files
authored
koord-descheduler: update k8s descheduler to 0.28.0 (#2156)
Signed-off-by: songtao98 <songtao2603060@gmail.com>
1 parent 396009d commit 2df0762

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
6060
sigs.k8s.io/controller-runtime v0.16.5
6161
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5
62-
sigs.k8s.io/descheduler v0.26.0
62+
sigs.k8s.io/descheduler v0.28.0
6363
sigs.k8s.io/yaml v1.3.0
6464
)
6565

@@ -297,5 +297,4 @@ replace (
297297
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.7
298298
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.7
299299
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5
300-
sigs.k8s.io/descheduler => sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194
301300
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,8 +1993,8 @@ sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cU
19931993
sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
19941994
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5 h1:q6JvS/AwlDfe9sHMTo1KOMdI376+mlB21pV7Xhfy5uA=
19951995
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5/go.mod h1:B6HLcvOy2S1qq2eWOFm9xepiKPMIc8Z9OXSPsnUDaR4=
1996-
sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194 h1:xPrRjhoJr6pst13/3UHNwATYAsJROWcv+vvGRa+Fk1Q=
1997-
sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194/go.mod h1:/z7jjqyhgYDSd+LclGulcqX/JgfGIOTNB7ohFlGNQAQ=
1996+
sigs.k8s.io/descheduler v0.28.0 h1:ahB8Epb2txHa9WV2AWxYSIJV9Fr/8N6Ejyfplpl78j0=
1997+
sigs.k8s.io/descheduler v0.28.0/go.mod h1:GmzDGIeFdVQqw7fXS2kt5PAJEXq+5AHNnYPRFq0Uh8g=
19981998
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
19991999
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
20002000
sigs.k8s.io/kustomize/api v0.13.4/go.mod h1:Bkaavz5RKK6ZzP0zgPrB7QbpbBJKiHuD3BB0KujY7Ls=

pkg/descheduler/framework/plugins/kubernetes/adaptor/evictor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
corev1 "k8s.io/api/core/v1"
2323
k8sdeschedulerevictions "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
24-
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
24+
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"
2525

2626
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
2727
frameworkruntime "github.com/koordinator-sh/koordinator/pkg/descheduler/framework/runtime"

pkg/descheduler/framework/plugins/kubernetes/adaptor/framework.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"k8s.io/client-go/informers"
2222
clientset "k8s.io/client-go/kubernetes"
2323
podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
24-
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
24+
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"
2525

2626
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
2727
)

pkg/descheduler/framework/plugins/kubernetes/defaultevictor/evictor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/client-go/kubernetes/scheme"
27-
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
2827
"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
28+
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"
2929

3030
"github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config/v1alpha2"
3131
"github.com/koordinator-sh/koordinator/pkg/descheduler/evictions"

pkg/descheduler/framework/plugins/kubernetes/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apimachinery/pkg/runtime/schema"
2727
"k8s.io/client-go/kubernetes/scheme"
28-
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
2928
"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
3029
"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
3130
"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
@@ -35,6 +34,7 @@ import (
3534
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
3635
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
3736
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
37+
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"
3838

3939
"github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config/v1alpha2"
4040
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"

pkg/descheduler/framework/plugins/kubernetes/plugin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/apimachinery/pkg/util/sets"
29-
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
3029
"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
3130
"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
3231
"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
@@ -36,6 +35,7 @@ import (
3635
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
3736
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
3837
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
38+
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"
3939

4040
deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config"
4141
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"

0 commit comments

Comments
 (0)