github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 20:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100101 from deads2k/mutated-options

Browse Source 
prevent mutation of deletion options during delete collection
This commit is contained in:
Kubernetes Prow Robot
2021-07-09 07:36:53 -07:00
committed by GitHub
parent 29652248eb 649b87aaf8
commit 3ccfe94563
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/scheduler/util.go
View File

@@ -474,9 +474,12 @@ func noPodsInNamespace(c clientset.Interface, podNamespace string) wait.Conditio
}
// cleanupPodsInNamespace deletes the pods in the given namespace and waits for them to
// be actually deleted.
// be actually deleted. They are removed with no grace.
func cleanupPodsInNamespace(cs clientset.Interface, t *testing.T, ns string) {
if err := cs.CoreV1().Pods(ns).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{}); err != nil {
t.Helper()
zero := int64(0)
if err := cs.CoreV1().Pods(ns).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &zero}, metav1.ListOptions{}); err != nil {
t.Errorf("error while listing pod in namespace %v: %v", ns, err)
return
}