From d8a001755915e0b0c939d22011fd16d25f45aa7c Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Fri, 3 Mar 2017 14:39:25 -0800 Subject: [PATCH] StatefulSet: Use synchronous Delete of SS in e2e. This is needed because we changed the default for SS to OrphanDependents. --- test/e2e/framework/statefulset_utils.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/statefulset_utils.go b/test/e2e/framework/statefulset_utils.go index 1f08ba57471..6b4129692f4 100644 --- a/test/e2e/framework/statefulset_utils.go +++ b/test/e2e/framework/statefulset_utils.go @@ -408,7 +408,9 @@ func DeleteAllStatefulSets(c clientset.Interface, ns string) { } sst.WaitForStatus(&ss, 0) Logf("Deleting statefulset %v", ss.Name) - if err := c.Apps().StatefulSets(ss.Namespace).Delete(ss.Name, nil); err != nil { + // Use OrphanDependents=false so it's deleted synchronously. + // We already made sure the Pods are gone inside Scale(). + if err := c.Apps().StatefulSets(ss.Namespace).Delete(ss.Name, &metav1.DeleteOptions{OrphanDependents: new(bool)}); err != nil { errList = append(errList, fmt.Sprintf("%v", err)) } }