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

[GarbageCollector] Add garbage collector into kube-controller-manager #26341

Merged

Conversation

caesarxuchao
Copy link
Member

@caesarxuchao caesarxuchao commented May 26, 2016

It's disabled by default.

Design doc is at https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/garbage-collection.md


This change is Reviewable

@caesarxuchao caesarxuchao added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. labels May 26, 2016
@caesarxuchao caesarxuchao added this to the v1.3 milestone May 26, 2016
@caesarxuchao
Copy link
Member Author

I think we need this piece for 1.3. @lavalamp

@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/old-docs size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 26, 2016
@@ -153,5 +154,6 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) {
fs.Float32Var(&s.KubeAPIQPS, "kube-api-qps", s.KubeAPIQPS, "QPS to use while talking with kubernetes apiserver")
fs.Int32Var(&s.KubeAPIBurst, "kube-api-burst", s.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver")
fs.DurationVar(&s.ControllerStartInterval.Duration, "controller-start-interval", s.ControllerStartInterval.Duration, "Interval between starting controller managers.")
fs.BoolVar(&s.EnableGarbageCollector, "enable-garbage-collector", s.EnableGarbageCollector, "enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-apiserver. WARNING: the generic garbage collector is an alpha feature")
Copy link
Member

Choose a reason for hiding this comment

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

s/enables/Enables/

end with a period.

@lavalamp
Copy link
Member

LGTM one nit.

@caesarxuchao caesarxuchao force-pushed the gc-controller-manager branch from 292977b to b74bd2f Compare May 26, 2016 18:04
@caesarxuchao
Copy link
Member Author

Address the nit. Applying the lgtm per comment.

@caesarxuchao caesarxuchao added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2016
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 28, 2016
@caesarxuchao caesarxuchao force-pushed the gc-controller-manager branch from b74bd2f to b3df629 Compare May 28, 2016 21:12
@caesarxuchao caesarxuchao added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels May 28, 2016
@caesarxuchao
Copy link
Member Author

Added back the lgtm after trivial rebase.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented May 29, 2016

GCE e2e build/test passed for commit b3df629.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 825cd92 into kubernetes:master May 29, 2016
@erictune erictune removed the release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. label Jul 2, 2016
@caesarxuchao caesarxuchao changed the title Add garbage collector into kube-controller-manager [GarbageCollector] Add garbage collector into kube-controller-manager Aug 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants