github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95592 from fromanirh/tm-e2e-avoid-sriovdp-leak

Browse Source 
e2e: topology manager: avoid sriov device plugin pod leak on test failures
This commit is contained in:
Kubernetes Prow Robot 2020-10-26 09:29:02 -07:00 committed by GitHub
commit 9cc882de87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/topology_manager_test.go
View File

@ -506,7 +506,7 @@ func teardownSRIOVConfigOrFail(f *framework.Framework, sd *sriovData) {
GracePeriodSeconds: &gp, GracePeriodSeconds: &gp,
} }
ginkgo.By("Delete SRIOV device plugin pod %s/%s") ginkgo.By(fmt.Sprintf("Delete SRIOV device plugin pod %s/%s", sd.pod.Namespace, sd.pod.Name))
err = f.ClientSet.CoreV1().Pods(sd.pod.Namespace).Delete(context.TODO(), sd.pod.Name, deleteOptions) err = f.ClientSet.CoreV1().Pods(sd.pod.Namespace).Delete(context.TODO(), sd.pod.Name, deleteOptions)
framework.ExpectNoError(err) framework.ExpectNoError(err)
waitForContainerRemoval(sd.pod.Spec.Containers[0].Name, sd.pod.Name, sd.pod.Namespace) waitForContainerRemoval(sd.pod.Spec.Containers[0].Name, sd.pod.Name, sd.pod.Namespace)
@ -527,6 +527,8 @@ func runTopologyManagerNodeAlignmentSuiteTests(f *framework.Framework, configMap
} }
sd := setupSRIOVConfigOrFail(f, configMap) sd := setupSRIOVConfigOrFail(f, configMap)
defer teardownSRIOVConfigOrFail(f, sd)
envInfo := &testEnvInfo{ envInfo := &testEnvInfo{
numaNodes: numaNodes, numaNodes: numaNodes,
sriovResourceName: sd.resourceName, sriovResourceName: sd.resourceName,
@ -695,7 +697,6 @@ func runTopologyManagerNodeAlignmentSuiteTests(f *framework.Framework, configMap
} }
runTopologyManagerNegativeTest(f, 1, ctnAttrs, envInfo) runTopologyManagerNegativeTest(f, 1, ctnAttrs, envInfo)
} }
teardownSRIOVConfigOrFail(f, sd)
} }
func runTopologyManagerTests(f *framework.Framework) { func runTopologyManagerTests(f *framework.Framework) {