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.

Sign up for GitHub

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

Jump to bottom

Change 'minion' to 'node' in docs #11130

Merged
merged 1 commit into from
Jul 13, 2015
Merged

Change 'minion' to 'node' in docs #11130

merged 1 commit into from
Jul 13, 2015
+30 −30

Conversation

thockin
Copy link
Member

@thockin thockin commented Jul 13, 2015

It's less than I wanted to get in, but better than nothing.

@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test passed for commit bcbd0638d1e9dbe4cf5aef1472246d9e9794aed5.

@nikhiljindal
Copy link
Contributor

#10843 is also making a similar change

kelseyhightower
kelseyhightower reviewed Jul 13, 2015
View reviewed changes
docs/devel/developer-guides/vagrant.md
@@ -13,7 +13,7 @@ Running kubernetes with Vagrant (and VirtualBox) is an easy way to run/test/deve

### Setup

By default, the Vagrant setup will create a single kubernetes-master and 1 kubernetes-minion. Each VM will take 1 GB, so make sure you have at least 2GB to 4GB of free memory (plus appropriate free disk space). To start your local cluster, open a shell and run:
By default, the Vagrant setup will create a single kubernetes-master and 1 node (kubernetes-minion). Each VM will take 1 GB, so make sure you have at least 2GB to 4GB of free memory (plus appropriate free disk space). To start your local cluster, open a shell and run:
Copy link
Contributor

Choose a reason for hiding this comment

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

kubernetes-minon/kubernetes-node?

Copy link
Member

Choose a reason for hiding this comment

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

Replace first sentence with:
By default, the Vagrant setup will create a single master node (called kubernetes-master) and 1 node (called kubernetes-minion-1).

Copy link
Member Author

Choose a reason for hiding this comment

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

next push

@kelseyhightower
Copy link
Contributor

Few comments, but first pass looks good to me.

erictune
erictune reviewed Jul 13, 2015
View reviewed changes
docs/getting-started-guides/fedora/fedora_ansible_config.md
@@ -58,7 +59,7 @@ We will set the kube_ip_addr to '10.254.0.[1-3]', for now. The reason we do thi
[etcd]
192.168.121.205

[minions]
[nodes]
Copy link
Member

Choose a reason for hiding this comment

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

Not sure this change is safe.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I doubt this can be changed without also updating https://github.com/eparis/kubernetes-ansible

Copy link
Member Author

Choose a reason for hiding this comment

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

oops, good catch

@thockin
Copy link
Member Author

thockin commented Jul 13, 2015

new push is up

@bgrant0607
Copy link
Member

LGTM other than the one typo that was introduced

@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test passed for commit 918bdd3a11144091b58b4ad2db34cce28959d491.

@kelseyhightower
Copy link
Contributor

LGTM

@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test passed for commit 40a4e6a66b724306fba8554195162dd363b01df1.

@bgrant0607 bgrant0607 mentioned this pull request Jul 13, 2015
Merged
@bgrant0607 bgrant0607 added the kind/documentation Categorizes issue or PR as related to documentation. label Jul 13, 2015
@thockin thockin closed this Jul 13, 2015
@thockin thockin reopened this Jul 13, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test failed for commit 96ceb7ea2e34ca79de6e69d192d6dcd2d8777de7.

@bgrant0607
Copy link
Member

Got unresolved merge conflicts

@thockin
Copy link
Member Author

thockin commented Jul 13, 2015

Merge resolved. Watching shippable. So tired of saying that.

@bgrant0607
Copy link
Member

LGTM

@bgrant0607 bgrant0607 added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge labels Jul 13, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test passed for commit 494d0ff39cf8a820e467fa492cb2a1020740d251.

@thockin
Copy link
Member Author

thockin commented Jul 13, 2015

1/2 shippable fails the same way every time:

--- FAIL: TestServiceRegistryIPUpdate (0.01s)
rest_test.go:698: Unexpected error type: <nil>
FAIL
coverage: 74.8% of statements
FAIL    github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service  0.122s

But it passes for me manually.

@thockin
Copy link
Member Author

thockin commented Jul 13, 2015

Merge and cross fingers.

thockin added a commit that referenced this pull request Jul 13, 2015
@thockin
Merge pull request #11130 from thockin/docs-minion
39d16d2 
Change 'minion' to 'node' in docs
@thockin thockin merged commit 39d16d2 into kubernetes:master Jul 13, 2015
@k8s-bot
Copy link

k8s-bot commented Jul 13, 2015

GCE e2e build/test failed for commit 5cf5445.

@thockin thockin deleted the docs-minion branch July 27, 2015 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
kind/documentation Categorizes issue or PR as related to documentation. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@thockin @k8s-bot @nikhiljindal @kelseyhightower @bgrant0607 @erictune @googlebot