Merge pull request #37272 from brendandburns/cleanup

Automatic merge from submit-queue Remove 'minion' from the code in two places in favor of 'node' Part of https://github.com/kubernetes/kubernetes/issues/1111

Merge pull request #37272 from brendandburns/cleanup
af23f40f · Kubernetes Submit Queue · GitHub · 0cd3cb75 · e68fe4d6 · af23f40f
Commit af23f40f authored Dec 14, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

validation_test.go pkg/api/validation/validation_test.go +1 -1

controller_utils.go pkg/controller/node/controller_utils.go +1 -1

No files found.
--- a/pkg/api/validation/validation_test.go
+++ b/pkg/api/validation/validation_test.go
@@ -8788,7 +8788,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)

--- a/pkg/controller/node/controller_utils.go
+++ b/pkg/controller/node/controller_utils.go
@@ -180,7 +180,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
 	node := nodeObj.(*v1.Node)
 	v, err := utilversion.ParseSemantic(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
 	}