Skip to content
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

deploy: collapse deployer into deployments controller #9691

Merged
merged 2 commits into from Jul 11, 2016
Merged

deploy: collapse deployer into deployments controller #9691

merged 2 commits into from Jul 11, 2016

Conversation

0xmichalis
Copy link
Contributor

@0xmichalis 0xmichalis commented Jul 4, 2016

@smarterclayton I wasn't hot about finishing this but the thing is that the deployer pod controller currently uses its own pod and rc caches whereas the deployment controller is sharing, a possible source for races?

Closes #9296

[test]

@ironcladlou @mfojtik fyi

@smarterclayton
Copy link
Contributor

Change looks ok, why not delete the old code though?

@0xmichalis
Copy link
Contributor Author

I will remove the controller in a follow-up

@0xmichalis
Copy link
Contributor Author

I will remove the controller in a follow-up

Removed in a separate commit here

@0xmichalis
Copy link
Contributor Author

[test]

@0xmichalis
Copy link
Contributor Author

#9129, [test]

@0xmichalis
Copy link
Contributor Author

[test]

@0xmichalis 0xmichalis mentioned this pull request Jul 7, 2016
10 tasks
@smarterclayton
Copy link
Contributor

@ironcladlou can you help me do a pass here?

@ironcladlou
Copy link
Contributor

Will take a look

@ironcladlou
Copy link
Contributor

This LGTM me too, more awesome work as usual. Is there any intent to do another level of collapsing of this into the deploymentConfigController (using the same strategy to enqueue DCs on RC update) or would that make the controller too unwieldy?

@0xmichalis
Copy link
Contributor Author

This LGTM me too, more awesome work as usual. Is there any intent to do another level of collapsing of this into the deploymentConfigController (using the same strategy to enqueue DCs on RC update) or would that make the controller too unwieldy?

I think we will always need the deployment controller and we may avoid precreating replica sets for upstream deployments, if we have a separate path in this controller that handles/tags appropriately those replica sets.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 84e1faf

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6007/)

@0xmichalis
Copy link
Contributor Author

0xmichalis commented Jul 11, 2016

@smarterclayton any other comments here? I will update the deployment controller to start retrying on update conflicts in a follow-up.

@smarterclayton
Copy link
Contributor

No, [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 11, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6007/) (Image: devenv-rhel7_4567)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 84e1faf

@openshift-bot openshift-bot merged commit 342c9e8 into openshift:master Jul 11, 2016
@0xmichalis 0xmichalis deleted the collapse-deployer-controller branch July 11, 2016 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants