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

Remove salt configuration that matches the default settings in the Kubelet. #6298

Merged
merged 1 commit into from
Apr 1, 2015

Conversation

roberthbailey
Copy link
Contributor

The eventual goal is to have as little of the Kubelet configuration as possible specified as command line flags, and to move it to cluster-specific configuration settings that are obtained from the master.

@roberthbailey
Copy link
Contributor Author

/cc @dchen1107

(still running e2e on this -- don't merge yet)

@dchen1107 dchen1107 self-assigned this Apr 1, 2015
@roberthbailey
Copy link
Contributor Author

My e2es passed locally (except for the monitoring test that I broke in my earlier PR and hadn't been rolled back before I started this e2e run).

@dchen1107
Copy link
Member

LGTM

dchen1107 added a commit that referenced this pull request Apr 1, 2015
Remove salt configuration that matches the default settings in the Kubelet.
@dchen1107 dchen1107 merged commit ab1a8b1 into kubernetes:master Apr 1, 2015
@roberthbailey roberthbailey deleted the kubelet-config branch April 9, 2015 21:29
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