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

Use shared informers in scheduler and token controller #14321

Merged
merged 6 commits into from
May 25, 2017

Conversation

smarterclayton
Copy link
Contributor

Contains upstream fixes and a few minor reaction changes. Rebase pick was a little ugly because of the number of changes, but verified it passed in upstream branch and downstream.

@deads2k @sttts [test]

@@ -609,6 +609,9 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro
// Start these first, because they provide credentials for other controllers' clients
oc.RunServiceAccountsController()
oc.RunServiceAccountTokensController(controllerManagerOptions)
// Must start a few informers now
oc.Informers.KubernetesInformers().Start(utilwait.NeverStop)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These need to start to make the SA token controller active, right? Be more descriptive in your comment. Lots of people end up here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, will add more of a comment

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to a8ba30b

@deads2k
Copy link
Contributor

deads2k commented May 24, 2017

lgtm

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1695/) (Base Commit: 61b1f2a)

@smarterclayton
Copy link
Contributor Author

[merge] for great performance

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to a8ba30b

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/785/) (Base Commit: 4a682ba)

@smarterclayton smarterclayton merged commit df5a465 into openshift:master May 25, 2017
@smarterclayton
Copy link
Contributor Author

[merge][severity: blocker] memory use is still p0 for 3.6

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.

3 participants