From 69eb837e3b1adf7d25d66c38a8b9d5c2da53ed74 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 18 Mar 2020 18:04:19 -0400 Subject: [PATCH] Restore orphaning check in gc test --- test/integration/garbagecollector/garbage_collector_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index cda3c4ef030..88430363829 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -461,6 +461,9 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet } orphan := false switch { + case options.OrphanDependents == nil && options.PropagationPolicy == nil && len(initialFinalizers) == 0: + // if there are no deletion options, the default policy for replication controllers is orphan + orphan = true case options.OrphanDependents != nil: // if the deletion options explicitly specify whether to orphan, that controls orphan = *options.OrphanDependents