Skip to content

Commit 4cf16ad

Browse files
committed
Partial revert 13326de
1 parent bbb9647 commit 4cf16ad

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

pkg/controller/controller_ref_manager.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,10 @@ func (m *RCControllerRefManager) AdoptReplicationController(rs *v1.ReplicationCo
142142
`{"metadata":{
143143
"ownerReferences":[{"apiVersion":"%s","kind":"%s","name":"%s","uid":"%s","controller":true,"blockOwnerDeletion":true}],
144144
"uid":"%s",
145-
"finalizers": ["%s"]
146145
}
147146
}`,
148147
m.controllerKind.GroupVersion(), m.controllerKind.Kind,
149-
m.Controller.GetName(), m.Controller.GetUID(), rs.UID,
150-
kmetav1.FinalizerDeleteDependents)
148+
m.Controller.GetName(), m.Controller.GetUID(), rs.UID)
151149
return m.rcControl.PatchReplicationController(rs.Namespace, rs.Name, []byte(addControllerPatch))
152150
}
153151

pkg/deploy/util/util.go

-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@ func MakeDeploymentV1(config *deployapi.DeploymentConfig, codec runtime.Codec) (
403403
},
404404
Labels: controllerLabels,
405405
OwnerReferences: []metav1.OwnerReference{*controllerRef},
406-
Finalizers: []string{metav1.FinalizerDeleteDependents},
407406
},
408407
Spec: v1.ReplicationControllerSpec{
409408
// The deployment should be inactive initially

0 commit comments

Comments
 (0)