Merge pull request #8853 from caesarxuchao/HostToNodeName

update PodSpec.Host to PodSpec.NodeName
2015-05-28 15:50:12 -07:00
parent e0fe9bb4d6 9c1153322e
commit 081ab3abac
45 changed files with 291 additions and 291 deletions
--- a/pkg/kubelet/config/common.go
+++ b/pkg/kubelet/config/common.go
@@ -68,7 +68,7 @@ func applyDefaults(pod *api.Pod, source string, isFile bool, hostname string) er
 	glog.V(5).Infof("Using namespace %q for pod %q from %s", pod.Namespace, pod.Name, source)

 	// Set the Host field to indicate this pod is scheduled on the current node.
-	pod.Spec.Host = hostname
+	pod.Spec.NodeName = hostname

 	pod.ObjectMeta.SelfLink = getSelfLink(pod.Name, pod.Namespace)
 	return nil
--- a/pkg/kubelet/config/file_test.go
+++ b/pkg/kubelet/config/file_test.go
@@ -99,7 +99,7 @@ func TestReadContainerManifestFromFile(t *testing.T) {
 					SelfLink:  getSelfLink("test-"+hostname, kubelet.NamespaceDefault),
 				},
 				Spec: api.PodSpec{
-					Host:          hostname,
+					NodeName:      hostname,
 					RestartPolicy: api.RestartPolicyAlways,
 					DNSPolicy:     api.DNSClusterFirst,
 					Containers: []api.Container{{
@@ -126,7 +126,7 @@ func TestReadContainerManifestFromFile(t *testing.T) {
 					SelfLink:  getSelfLink("12345-"+hostname, kubelet.NamespaceDefault),
 				},
 				Spec: api.PodSpec{
-					Host:          hostname,
+					NodeName:      hostname,
 					RestartPolicy: api.RestartPolicyAlways,
 					DNSPolicy:     api.DNSClusterFirst,
 					Containers: []api.Container{{
@@ -196,7 +196,7 @@ func TestReadPodsFromFile(t *testing.T) {
 					SelfLink:  getSelfLink("test-"+hostname, "mynamespace"),
 				},
 				Spec: api.PodSpec{
-					Host:          hostname,
+					NodeName:      hostname,
 					RestartPolicy: api.RestartPolicyAlways,
 					DNSPolicy:     api.DNSClusterFirst,
 					Containers: []api.Container{{
@@ -231,7 +231,7 @@ func TestReadPodsFromFile(t *testing.T) {
 					SelfLink:  getSelfLink("12345-"+hostname, kubelet.NamespaceDefault),
 				},
 				Spec: api.PodSpec{
-					Host:          hostname,
+					NodeName:      hostname,
 					RestartPolicy: api.RestartPolicyAlways,
 					DNSPolicy:     api.DNSClusterFirst,
 					Containers: []api.Container{{
@@ -371,7 +371,7 @@ func exampleManifestAndPod(id string) (v1beta1.ContainerManifest, *api.Pod) {
 			SelfLink:  getSelfLink(id+"-"+hostname, kubelet.NamespaceDefault),
 		},
 		Spec: api.PodSpec{
-			Host: hostname,
+			NodeName: hostname,
 			Containers: []api.Container{
 				{
 					Name:  "c" + id,
--- a/pkg/kubelet/config/http_test.go
+++ b/pkg/kubelet/config/http_test.go
@@ -145,7 +145,7 @@ func TestExtractManifestFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("foo-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -172,7 +172,7 @@ func TestExtractManifestFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("111-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -199,7 +199,7 @@ func TestExtractManifestFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("foo-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -230,7 +230,7 @@ func TestExtractManifestFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("foo-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -250,7 +250,7 @@ func TestExtractManifestFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("bar-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -328,7 +328,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 					Namespace: "mynamespace",
 				},
 				Spec: api.PodSpec{
-					Host:       hostname,
+					NodeName:   hostname,
 					Containers: []api.Container{{Name: "1", Image: "foo", ImagePullPolicy: api.PullAlways}},
 				},
 			},
@@ -343,7 +343,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("foo-"+hostname, "mynamespace"),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -369,7 +369,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 							UID:  "111",
 						},
 						Spec: api.PodSpec{
-							Host:       hostname,
+							NodeName:   hostname,
 							Containers: []api.Container{{Name: "1", Image: "foo", ImagePullPolicy: api.PullAlways}},
 						},
 					},
@@ -379,7 +379,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 							UID:  "222",
 						},
 						Spec: api.PodSpec{
-							Host:       hostname,
+							NodeName:   hostname,
 							Containers: []api.Container{{Name: "2", Image: "bar", ImagePullPolicy: ""}},
 						},
 					},
@@ -396,7 +396,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("foo-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
@@ -416,7 +416,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
 						SelfLink: getSelfLink("bar-"+hostname, kubelet.NamespaceDefault),
 					},
 					Spec: api.PodSpec{
-						Host:          hostname,
+						NodeName:      hostname,
 						RestartPolicy: api.RestartPolicyAlways,
 						DNSPolicy:     api.DNSClusterFirst,
 						Containers: []api.Container{{
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -1739,7 +1739,7 @@ func failedState(cName string) api.ContainerStatus {

 func TestPodPhaseWithRestartAlways(t *testing.T) {
 	desiredState := api.PodSpec{
-		Host: "machine",
+		NodeName: "machine",
 		Containers: []api.Container{
 			{Name: "containerA"},
 			{Name: "containerB"},
@@ -1814,7 +1814,7 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {

 func TestPodPhaseWithRestartNever(t *testing.T) {
 	desiredState := api.PodSpec{
-		Host: "machine",
+		NodeName: "machine",
 		Containers: []api.Container{
 			{Name: "containerA"},
 			{Name: "containerB"},
@@ -1902,7 +1902,7 @@ func TestPodPhaseWithRestartNever(t *testing.T) {

 func TestPodPhaseWithRestartOnFailure(t *testing.T) {
 	desiredState := api.PodSpec{
-		Host: "machine",
+		NodeName: "machine",
 		Containers: []api.Container{
 			{Name: "containerA"},
 			{Name: "containerB"},