Commit e68fe4d6 authored by Brendan Burns's avatar Brendan Burns

Remove 'minion' from the code in two places in favor of 'node'

parent 0042ce56
...@@ -8680,7 +8680,7 @@ func newNodeNameEndpoint(nodeName string) *api.Endpoints { ...@@ -8680,7 +8680,7 @@ func newNodeNameEndpoint(nodeName string) *api.Endpoints {
} }
func TestEndpointAddressNodeNameUpdateRestrictions(t *testing.T) { func TestEndpointAddressNodeNameUpdateRestrictions(t *testing.T) {
oldEndpoint := newNodeNameEndpoint("kubernetes-minion-setup-by-backend") oldEndpoint := newNodeNameEndpoint("kubernetes-node-setup-by-backend")
updatedEndpoint := newNodeNameEndpoint("kubernetes-changed-nodename") updatedEndpoint := newNodeNameEndpoint("kubernetes-changed-nodename")
// Check that NodeName cannot be changed during update (if already set) // Check that NodeName cannot be changed during update (if already set)
errList := ValidateEndpoints(updatedEndpoint) errList := ValidateEndpoints(updatedEndpoint)
......
...@@ -179,7 +179,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) { ...@@ -179,7 +179,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
node := nodeObj.(*api.Node) node := nodeObj.(*api.Node)
v, err := version.Parse(node.Status.NodeInfo.KubeletVersion) v, err := version.Parse(node.Status.NodeInfo.KubeletVersion)
if err != nil { 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)) utilruntime.HandleError(nc.forcefullyDeletePod(pod))
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment