github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Change minion to node

Browse Source 
Contination of #1111

I tried to keep this PR down to just a simple search-n-replace to keep
things simple.  I may have gone too far in some spots but its easy to
roll those back if needed.

I avoided renaming `contrib/mesos/pkg/minion` because there's already
a `contrib/mesos/pkg/node` dir and fixing that will require a bit of work
due to a circular import chain that pops up. So I'm saving that for a
follow-on PR.

I rolled back some of this from a previous commit because it just got
to big/messy. Will follow up with additional PRs

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis
2016-05-05 13:41:49 -07:00
parent 5af1b25235
commit 9d5bac6330
40 changed files with 195 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/cmd/cmd_test.go
View File

@@ -573,7 +573,7 @@ func Example_printPodWithWideFormat() {
NegotiatedSerializer: ns,
Client: nil,
}
nodeName := "kubernetes-minion-abcd"
nodeName := "kubernetes-node-abcd"
cmd := NewCmdRun(f, os.Stdin, os.Stdout, os.Stderr)
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
@@ -600,7 +600,7 @@ func Example_printPodWithWideFormat() {
}
// Output:
// NAME READY STATUS RESTARTS AGE IP NODE
// test1 1/2 podPhase 6 10y 10.1.1.3 kubernetes-minion-abcd
// test1 1/2 podPhase 6 10y 10.1.1.3 kubernetes-node-abcd
}
func Example_printPodWithShowLabels() {
@@ -613,7 +613,7 @@ func Example_printPodWithShowLabels() {
NegotiatedSerializer: ns,
Client: nil,
}
nodeName := "kubernetes-minion-abcd"
nodeName := "kubernetes-node-abcd"
cmd := NewCmdRun(f, os.Stdin, os.Stdout, os.Stderr)
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
@@ -647,7 +647,7 @@ func Example_printPodWithShowLabels() {
}
func newAllPhasePodList() *api.PodList {
nodeName := "kubernetes-minion-abcd"
nodeName := "kubernetes-node-abcd"
return &api.PodList{
Items: []api.Pod{
{