-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UPSTREAM: 44058: Make background garbage collection cascading #14907
Conversation
[test] |
@@ -142,12 +142,10 @@ func (m *RCControllerRefManager) AdoptReplicationController(rs *v1.ReplicationCo | |||
`{"metadata":{ | |||
"ownerReferences":[{"apiVersion":"%s","kind":"%s","name":"%s","uid":"%s","controller":true,"blockOwnerDeletion":true}], | |||
"uid":"%s", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@soltysh that trailing comma is invalid JSON
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, will fix.
@liggitt I don't think we have backported the finalizers in Deployments yet so nothing to revert for Deplyoments, but I would have to check |
#14880 should go first to be sure about changing JSON and it also tests cascade deletion for DC->RC->Pod |
@liggitt Deployment finalizers we not backported https://github.com/openshift/origin/blob/master/vendor/k8s.io/kubernetes/pkg/controller/controller_ref_manager.go#L352-L352 |
@liggitt the bits that happened upstream were reverted as part of the same PR, iiuc. Nothing else was added. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, but wait for #14880 to be sure
LGTM as well |
#14880 is in; [test] |
Evaluated for origin test up to 531471d |
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2743/) (Base Commit: 6bbad88) (PR Branch Commit: 531471d) |
The new tests succeeded. Ship it! |
[merge] on two lgtm |
continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 7 |
Evaluated for origin merge up to 531471d |
Green tests against current HEAD. No conflicts with top of the queue. merging |
This is upstream cherry-pick and revert of the changes that happened in origin in the mean time to address problems with garbage collection.
Fixes #14805
@liggitt @jwforres @mfojtik fyi
@tnozicka ptal