github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix:[Flake] [sig-node] Restart [Serial] [Slow] [Disruptive] Kubelet should correctly account for terminated pods after restart"

Browse Source 
This reverts commit 572360c5a5.
This commit is contained in:
Aditi Sharma 2023-01-11 15:05:49 +05:30
parent cfa6ad50e6
commit 0a7b2eeae0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/container_manager_test.go
View File

@ -28,9 +28,6 @@ import (
"strings" "strings"
"time" "time"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
testutils "k8s.io/kubernetes/test/utils"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -38,6 +35,7 @@ import (
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
@ -198,9 +196,6 @@ var _ = SIGDescribe("Container Manager Misc [Serial]", func() {
}, },
}, },
}) })
if err := e2epod.WaitForPodCondition(ctx, f.ClientSet, f.Namespace.Name, podName, "Ready", 120*time.Second, testutils.PodRunningReady); err != nil {
framework.ExpectNoError(err, fmt.Sprintf("Pod %v could not enter running/ready", podName))
}
var ( var (
ngPids []int ngPids []int
err error err error
@ -217,7 +212,7 @@ var _ = SIGDescribe("Container Manager Misc [Serial]", func() {
} }
return nil return nil
}, 30*time.Second, time.Second*4).Should(gomega.BeNil()) }, 2*time.Minute, time.Second*4).Should(gomega.BeNil())
}) })
ginkgo.It("burstable container's oom-score-adj should be between [2, 1000)", func(ctx context.Context) { ginkgo.It("burstable container's oom-score-adj should be between [2, 1000)", func(ctx context.Context) {
@ -243,9 +238,6 @@ var _ = SIGDescribe("Container Manager Misc [Serial]", func() {
}, },
}, },
}) })
if err := e2epod.WaitForPodCondition(ctx, f.ClientSet, f.Namespace.Name, podName, "Ready", 120*time.Second, testutils.PodRunningReady); err != nil {
framework.ExpectNoError(err, fmt.Sprintf("Pod %v could not enter running/ready", podName))
}
var ( var (
wsPids []int wsPids []int
err error err error
@ -261,7 +253,7 @@ var _ = SIGDescribe("Container Manager Misc [Serial]", func() {
} }
} }
return nil return nil
}, 30*time.Second, time.Second*4).Should(gomega.BeNil()) }, 2*time.Minute, time.Second*4).Should(gomega.BeNil())
// TODO: Test the oom-score-adj logic for burstable more accurately. // TODO: Test the oom-score-adj logic for burstable more accurately.
}) })