From e68fe4d62e21c300ca059428ef0f9b8433ced6ef Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 21 Nov 2016 22:48:06 -0800 Subject: [PATCH] Remove 'minion' from the code in two places in favor of 'node' --- pkg/api/validation/validation_test.go | 2 +- pkg/controller/node/controller_utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index e91ee13d64f..fd713f564ad 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -8680,7 +8680,7 @@ func newNodeNameEndpoint(nodeName string) *api.Endpoints { } func TestEndpointAddressNodeNameUpdateRestrictions(t *testing.T) { - oldEndpoint := newNodeNameEndpoint("kubernetes-minion-setup-by-backend") + oldEndpoint := newNodeNameEndpoint("kubernetes-node-setup-by-backend") updatedEndpoint := newNodeNameEndpoint("kubernetes-changed-nodename") // Check that NodeName cannot be changed during update (if already set) errList := ValidateEndpoints(updatedEndpoint) diff --git a/pkg/controller/node/controller_utils.go b/pkg/controller/node/controller_utils.go index fa10c2e8b88..d3937118cef 100644 --- a/pkg/controller/node/controller_utils.go +++ b/pkg/controller/node/controller_utils.go @@ -179,7 +179,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) { node := nodeObj.(*api.Node) v, err := version.Parse(node.Status.NodeInfo.KubeletVersion) if err != nil { - glog.V(0).Infof("couldn't parse verions %q of minion: %v", node.Status.NodeInfo.KubeletVersion, err) + glog.V(0).Infof("couldn't parse verions %q of node: %v", node.Status.NodeInfo.KubeletVersion, err) utilruntime.HandleError(nc.forcefullyDeletePod(pod)) return }