github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-22 07:03:28 +00:00
Code Issues Projects Releases Wiki Activity

test: add batch pod deletion for kubelet e2e tests

Browse Source
This commit is contained in:
ylink-lfs
2025-07-16 09:26:19 +08:00
parent 1b6a6cc9c0
commit fb4e252224
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/framework/pod/delete.go
View File

@@ -26,6 +26,7 @@ import (
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/errors"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
)
@@ -56,6 +57,21 @@ func DeletePodWithWait(ctx context.Context, c clientset.Interface, pod *v1.Pod)
return DeletePodWithWaitByName(ctx, c, pod.GetName(), pod.GetNamespace())
}
// DeletePodsWithWait deletes the passed-in pods, waits for them to be terminated, and reports any deletion errors that occur.
func DeletePodsWithWait(ctx context.Context, c clientset.Interface, pods []*v1.Pod) {
var delErrs []error
for _, testPod := range pods {
delErr := c.CoreV1().Pods(testPod.Namespace).Delete(ctx, testPod.Name, metav1.DeleteOptions{})
if delErr != nil && !apierrors.IsNotFound(delErr) {
delErrs = append(delErrs, delErr)
}
}
framework.ExpectNoError(errors.NewAggregate(delErrs), "while deleting pods")
for _, testPod := range pods {
framework.ExpectNoError(WaitForPodNotFoundInNamespace(ctx, c, testPod.Name, testPod.Namespace, PodDeleteTimeout))
}
}
// DeletePodWithWaitByName deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod
// not existing.
func DeletePodWithWaitByName(ctx context.Context, c clientset.Interface, podName, podNamespace string) error {

5
test/e2e/node/kubelet.go
View File

@@ -409,10 +409,7 @@ var _ = SIGDescribe("kubelet", func() {
})
ginkgo.AfterEach(func(ctx context.Context) {
err := e2epod.DeletePodWithWait(ctx, c, pod)
framework.ExpectNoError(err, "AfterEach: Failed to delete client pod ", pod.Name)
err = e2epod.DeletePodWithWait(ctx, c, nfsServerPod)
framework.ExpectNoError(err, "AfterEach: Failed to delete server pod ", nfsServerPod.Name)
e2epod.DeletePodsWithWait(ctx, c, []*v1.Pod{pod, nfsServerPod})
})
// execute It blocks from above table of tests

23
test/e2e/node/pod_resize.go
View File

@@ -24,7 +24,6 @@ import (
v1 "k8s.io/api/core/v1"
schedulingv1 "k8s.io/api/scheduling/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@@ -382,10 +381,7 @@ func doPodResizeSchedulerTests(f *framework.Framework) {
waitForPodDeferred(ctx, f, testPod1)
ginkgo.By("deleting pods 2 and 3")
delErr2 := e2epod.DeletePodWithWait(ctx, f.ClientSet, testPod2)
framework.ExpectNoError(delErr2, "failed to delete pod %s", testPod2.Name)
delErr3 := e2epod.DeletePodWithWait(ctx, f.ClientSet, testPod3)
framework.ExpectNoError(delErr3, "failed to delete pod %s", testPod3.Name)
e2epod.DeletePodsWithWait(ctx, f.ClientSet, []*v1.Pod{testPod2, testPod3})
ginkgo.By(fmt.Sprintf("TEST3: Verify pod '%s' is resized successfully after pod deletion '%s' and '%s", testPod1.Name, testPod2.Name, testPod3.Name))
expected := []podresize.ResizableContainerInfo{
@@ -538,12 +534,7 @@ func doPodResizeRetryDeferredTests(f *framework.Framework) {
podresize.ExpectPodResized(ctx, f, resizedPod, expected)
ginkgo.By("deleting pods")
delErr1 := e2epod.DeletePodWithWait(ctx, f.ClientSet, testPod1)
framework.ExpectNoError(delErr1, "failed to delete pod %s", testPod1.Name)
delErr2 := e2epod.DeletePodWithWait(ctx, f.ClientSet, testPod2)
framework.ExpectNoError(delErr2, "failed to delete pod %s", testPod2.Name)
delErr3 := e2epod.DeletePodWithWait(ctx, f.ClientSet, testPod3)
framework.ExpectNoError(delErr3, "failed to delete pod %s", testPod3.Name)
e2epod.DeletePodsWithWait(ctx, f.ClientSet, []*v1.Pod{testPod1, testPod2, testPod3})
})
ginkgo.It("pod-resize-retry-deferred-test-2", func(ctx context.Context) {
@@ -905,15 +896,7 @@ func doPodResizeRetryDeferredTests(f *framework.Framework) {
podresize.ExpectPodResized(ctx, f, resizedPod, expectedTestPod4Resized)
ginkgo.By("deleting pods")
for _, testPod := range testPods {
delErr := f.ClientSet.CoreV1().Pods(testPod.Namespace).Delete(ctx, testPod.Name, metav1.DeleteOptions{})
if delErr != nil && !apierrors.IsNotFound(delErr) {
framework.ExpectNoError(delErr, "failed to delete pod %s", testPod.Name)
}
}
for _, testPod := range testPods {
framework.ExpectNoError(e2epod.WaitForPodNotFoundInNamespace(ctx, f.ClientSet, testPod.Name, testPod.Namespace, e2epod.PodDeleteTimeout))
}
e2epod.DeletePodsWithWait(ctx, f.ClientSet, testPods)
})
}