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

Describes addition and deletion of minions (or nodes) at run time, and some other fixes. #5847

Merged

Conversation

aveshagarwal
Copy link
Member

Describes addition and deletion of minions (or nodes) at run time by using their json representation. This update also removes changes to /etc/kubernetes/proxy as kube master is already set in /etc/kubernetes/config so those are not required.

@googlebot
Copy link

Thanks for your pull request.

It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA) at https://cla.developers.google.com/.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check the information on your CLA or see this help article on setting the email on your git commits.

Once you've done that, please reply here to let us know. If you signed the CLA as a corporation, please let us know the company's name.

@@ -151,3 +139,56 @@ fed-minion <none> Ready
**The cluster should be running! Launch a test pod.**

You should have a functional cluster, check out [101](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/examples/walkthrough/README.md)!

**Run time addition/deletion of minions (or nodes).**
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it really make sense to put this AFTER we say the cluster is up?

Shouldn't we remove the --machines= stuff from the controller-manager?

@aveshagarwal aveshagarwal force-pushed the kubernetes-fedora-guides-minions branch from 1caec5e to 2944cac Compare March 24, 2015 16:05
"resources": {
"capacity": {
"cpu": 1,
"memory": 1073741824
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's not include a capacity statement. Let just the the embedded cadvisor code supply this information.

Copy link
Member Author

Choose a reason for hiding this comment

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

ok deleted.

@aveshagarwal aveshagarwal force-pushed the kubernetes-fedora-guides-minions branch from 2944cac to 4fc2e2e Compare March 24, 2015 17:25
"labels": {
"name": "fed-node-label",
},
}
Copy link
Contributor

Choose a reason for hiding this comment

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

json is malformed
trailing ',' after the label name
trailing ',' and after the label '}'

Also whitespace seems a little nutty....

Copy link
Member Author

Choose a reason for hiding this comment

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

{
"id": "fed-node",
"kind": "Minion",
"apiVersion": "v1beta1",
"labels": {
"name": "fed-node-label"
}
}
Is this ok?
Not sure which whitespace you are talking about?

Removes --machines stuff from /etc/kubernetes/controller-manager, and now
no change is required in it from its default configuration.
Changes terminology from kubernetes minions to kubernetes nodes.
Fixes /etc/kubernetes/proxy duplication issue.
@aveshagarwal aveshagarwal force-pushed the kubernetes-fedora-guides-minions branch from 4fc2e2e to 8d345fc Compare March 24, 2015 18:11
eparis added a commit that referenced this pull request Mar 25, 2015
…inions

Describes addition and deletion of minions (or nodes) at run time, and some other fixes.
@eparis eparis merged commit 5045299 into kubernetes:master Mar 25, 2015
@aveshagarwal aveshagarwal deleted the kubernetes-fedora-guides-minions branch March 25, 2015 18:51
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.

4 participants