github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37272 from brendandburns/cleanup

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-12-14 00:09:43 -08:00 committed by GitHub
commit af23f40f82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/validation/validation_test.go
View File

@ -8788,7 +8788,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)

2
pkg/controller/node/controller_utils.go
View File

@ -180,7 +180,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
node := nodeObj.(*v1.Node) node := nodeObj.(*v1.Node)
v, err := utilversion.ParseSemantic(node.Status.NodeInfo.KubeletVersion) v, err := utilversion.ParseSemantic(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
} }