github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 23:57:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91150 from brianpursley/e2e-delete-pods

Browse Source 
Add code to delete pods at the end of e2e tests to free up capacity
This commit is contained in:
Kubernetes Prow Robot 2020-05-18 13:33:48 -07:00 committed by GitHub
commit 0d4464d014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/apimachinery/garbage_collector.go
View File

@ -42,6 +42,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"github.com/onsi/ginkgo"
@ -443,6 +444,9 @@ var _ = SIGDescribe("Garbage collector", func() {
framework.Failf("expect %d pods, got %d pods", e, a)
}
gatherMetrics(f)
if err = e2epod.DeletePodsWithGracePeriod(clientSet, pods.Items, 0); err != nil {
framework.Logf("WARNING: failed to delete pods: %v", err)
}
})
// deleteOptions.OrphanDependents is deprecated in 1.7 and preferred to use the PropagationPolicy.
@ -489,6 +493,9 @@ var _ = SIGDescribe("Garbage collector", func() {
framework.Failf("expect %d pods, got %d pods", e, a)
}
gatherMetrics(f)
if err = e2epod.DeletePodsWithGracePeriod(clientSet, pods.Items, 0); err != nil {
framework.Logf("WARNING: failed to delete pods: %v", err)
}
})
/*
@ -827,6 +834,9 @@ var _ = SIGDescribe("Garbage collector", func() {
}
}
gatherMetrics(f)
if err = e2epod.DeletePodsWithGracePeriod(clientSet, pods.Items, 0); err != nil {
framework.Logf("WARNING: failed to delete pods: %v", err)
}
})
// TODO: should be an integration test

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

@ -69,3 +69,31 @@ func DeletePodWithWaitByName(c clientset.Interface, podName, podNamespace string
}
return nil
}
// DeletePodWithGracePeriod deletes the passed-in pod. Resilient to the pod not existing.
func DeletePodWithGracePeriod(c clientset.Interface, pod *v1.Pod, grace int64) error {
return DeletePodWithGracePeriodByName(c, pod.GetName(), pod.GetNamespace(), grace)
}
// DeletePodsWithGracePeriod deletes the passed-in pods. Resilient to the pods not existing.
func DeletePodsWithGracePeriod(c clientset.Interface, pods []v1.Pod, grace int64) error {
for _, pod := range pods {
if err := DeletePodWithGracePeriod(c, &pod, grace); err != nil {
return err
}
}
return nil
}
// DeletePodWithGracePeriodByName deletes a pod by name and namespace. Resilient to the pod not existing.
func DeletePodWithGracePeriodByName(c clientset.Interface, podName, podNamespace string, grace int64) error {
e2elog.Logf("Deleting pod %q in namespace %q", podName, podNamespace)
err := c.CoreV1().Pods(podNamespace).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(grace))
if err != nil {
if apierrors.IsNotFound(err) {
return nil // assume pod was already deleted
}
return fmt.Errorf("pod Delete API error: %v", err)
}
return nil
}