github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8853 from caesarxuchao/HostToNodeName

Browse Source 
update PodSpec.Host to PodSpec.NodeName
This commit is contained in:
Tim Hockin
2015-05-28 15:50:12 -07:00
parent e0fe9bb4d6 9c1153322e
commit 081ab3abac
45 changed files with 291 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/nodecontroller/nodecontroller.go
View File

@@ -425,7 +425,7 @@ func (nc *NodeController) deletePods(nodeID string) error {
}
for _, pod := range pods.Items {
// Defensive check, also needed for tests.
if pod.Spec.Host != nodeID {
if pod.Spec.NodeName != nodeID {
continue
}
glog.V(2).Infof("Delete pod %v", pod.Name)

2
pkg/cloudprovider/nodecontroller/nodecontroller_test.go
View File

@@ -566,7 +566,7 @@ func newNode(name string) *api.Node {
}
func newPod(name, host string) *api.Pod {
return &api.Pod{ObjectMeta: api.ObjectMeta{Name: name}, Spec: api.PodSpec{Host: host}}
return &api.Pod{ObjectMeta: api.ObjectMeta{Name: name}, Spec: api.PodSpec{NodeName: host}}
}
func sortedNodeNames(nodes []*api.Node) []string {