Merge pull request #14907 from soltysh/issue14805

UPSTREAM: 44058: Make background garbage collection cascading

Author: deads2k

pkg/controller/controller_ref_manager.go

@@ -141,13 +141,11 @@ func (m *RCControllerRefManager) AdoptReplicationController(rs *v1.ReplicationCo
 	addControllerPatch := fmt.Sprintf(
 		`{"metadata":{
 			"ownerReferences":[{"apiVersion":"%s","kind":"%s","name":"%s","uid":"%s","controller":true,"blockOwnerDeletion":true}],
-			"uid":"%s",
-			"finalizers": ["%s"]
+			"uid":"%s"
 			}
 		}`,
 		m.controllerKind.GroupVersion(), m.controllerKind.Kind,
-		m.Controller.GetName(), m.Controller.GetUID(), rs.UID,
-		kmetav1.FinalizerDeleteDependents)
+		m.Controller.GetName(), m.Controller.GetUID(), rs.UID)
 	return m.rcControl.PatchReplicationController(rs.Namespace, rs.Name, []byte(addControllerPatch))
 }
 

pkg/deploy/util/util.go

@@ -403,7 +403,6 @@ func MakeDeploymentV1(config *deployapi.DeploymentConfig, codec runtime.Codec) (
 			},
 			Labels:          controllerLabels,
 			OwnerReferences: []metav1.OwnerReference{*controllerRef},
-			Finalizers:      []string{metav1.FinalizerDeleteDependents},
 		},
 		Spec: v1.ReplicationControllerSpec{
 			// The deployment should be inactive initially