Skip to content

Commit

Permalink
koord-descheduler: update k8s descheduler to 0.28.0 (#2156)
Browse files Browse the repository at this point in the history
Signed-off-by: songtao98 <[email protected]>
  • Loading branch information
songtao98 authored Sep 2, 2024
1 parent 396009d commit 2df0762
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ require (
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/controller-runtime v0.16.5
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5
sigs.k8s.io/descheduler v0.26.0
sigs.k8s.io/descheduler v0.28.0
sigs.k8s.io/yaml v1.3.0
)

Expand Down Expand Up @@ -297,5 +297,4 @@ replace (
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.7
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5
sigs.k8s.io/descheduler => sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1993,8 +1993,8 @@ sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cU
sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5 h1:q6JvS/AwlDfe9sHMTo1KOMdI376+mlB21pV7Xhfy5uA=
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231005234617-5771399a8ce5/go.mod h1:B6HLcvOy2S1qq2eWOFm9xepiKPMIc8Z9OXSPsnUDaR4=
sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194 h1:xPrRjhoJr6pst13/3UHNwATYAsJROWcv+vvGRa+Fk1Q=
sigs.k8s.io/descheduler v0.26.1-0.20230402001301-90905d2c2194/go.mod h1:/z7jjqyhgYDSd+LclGulcqX/JgfGIOTNB7ohFlGNQAQ=
sigs.k8s.io/descheduler v0.28.0 h1:ahB8Epb2txHa9WV2AWxYSIJV9Fr/8N6Ejyfplpl78j0=
sigs.k8s.io/descheduler v0.28.0/go.mod h1:GmzDGIeFdVQqw7fXS2kt5PAJEXq+5AHNnYPRFq0Uh8g=
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/kustomize/api v0.13.4/go.mod h1:Bkaavz5RKK6ZzP0zgPrB7QbpbBJKiHuD3BB0KujY7Ls=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

corev1 "k8s.io/api/core/v1"
k8sdeschedulerevictions "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"

"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
frameworkruntime "github.com/koordinator-sh/koordinator/pkg/descheduler/framework/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes"
podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"

"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/scheme"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"

"github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config/v1alpha2"
"github.com/koordinator-sh/koordinator/pkg/descheduler/evictions"
Expand Down
2 changes: 1 addition & 1 deletion pkg/descheduler/framework/plugins/kubernetes/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/scheme"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
Expand All @@ -35,6 +34,7 @@ import (
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"

"github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config/v1alpha2"
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework"
"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
Expand All @@ -36,6 +35,7 @@ import (
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
k8sdeschedulerframework "sigs.k8s.io/descheduler/pkg/framework/types"

deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config"
"github.com/koordinator-sh/koordinator/pkg/descheduler/framework"
Expand Down

0 comments on commit 2df0762

Please sign in to comment.