Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Add maxNoOfPodsToEvictPerNamespace policy

Browse Source
This commit is contained in:
Kubernetes Prow Robot
2021-11-29 08:43:23 -08:00
committed by Jane Liu L
parent 5cf381a817 73a7adf572
commit 82201d0e48
23 changed files with 268 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/e2e_duplicatepods_test.go
View File

@@ -18,17 +18,18 @@ package e2e
import (
"context"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"strings"
"testing"
"time"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
deschedulerapi "sigs.k8s.io/descheduler/pkg/api"
"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
@@ -87,7 +88,7 @@ func TestRemoveDuplicates(t *testing.T) {
description string
replicasNum int
beforeFunc func(deployment *appsv1.Deployment)
expectedEvictedPodCount int
expectedEvictedPodCount uint
}{
{
description: "Evict Pod even Pods schedule to specific node",
@@ -143,7 +144,8 @@ func TestRemoveDuplicates(t *testing.T) {
clientSet,
evictionPolicyGroupVersion,
false,
0,
nil,
nil,
nodes,
true,
false,

9
test/e2e/e2e_failedpods_test.go
View File

@@ -2,15 +2,16 @@ package e2e
import (
"context"
"strings"
"testing"
"time"
batchv1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"strings"
"testing"
"time"
deschedulerapi "sigs.k8s.io/descheduler/pkg/api"
"sigs.k8s.io/descheduler/pkg/descheduler/strategies"
@@ -34,7 +35,7 @@ func TestFailedPods(t *testing.T) {
}
defer clientSet.CoreV1().Namespaces().Delete(ctx, testNamespace.Name, metav1.DeleteOptions{})
testCases := map[string]struct {
expectedEvictedCount int
expectedEvictedCount uint
strategyParams *deschedulerapi.StrategyParameters
}{
"test-failed-pods-nil-strategy": {

6
test/e2e/e2e_test.go
View File

@@ -166,7 +166,8 @@ func runPodLifetimeStrategy(
clientset,
evictionPolicyGroupVersion,
false,
0,
nil,
nil,
nodes,
false,
evictCritical,
@@ -1290,7 +1291,8 @@ func initPodEvictorOrFail(t *testing.T, clientSet clientset.Interface, nodes []*
clientSet,
evictionPolicyGroupVersion,
false,
0,
nil,
nil,
nodes,
true,
false,

12
test/e2e/e2e_toomanyrestarts_test.go
View File

@@ -19,6 +19,10 @@ package e2e
import (
"context"
"fmt"
"strings"
"testing"
"time"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -28,9 +32,6 @@ import (
"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
"sigs.k8s.io/descheduler/pkg/descheduler/strategies"
"strings"
"testing"
"time"
)
func TestTooManyRestarts(t *testing.T) {
@@ -108,7 +109,7 @@ func TestTooManyRestarts(t *testing.T) {
name string
podRestartThreshold int32
includingInitContainers bool
expectedEvictedPodCount int
expectedEvictedPodCount uint
}{
{
name: "test-no-evictions",
@@ -133,7 +134,8 @@ func TestTooManyRestarts(t *testing.T) {
clientSet,
evictionPolicyGroupVersion,
false,
0,
nil,
nil,
nodes,
true,
false,