Merge pull request #8853 from caesarxuchao/HostToNodeName

update PodSpec.Host to PodSpec.NodeName

pkg/api/deep_copy_generated.go

@@ -1374,7 +1374,7 @@ func deepCopy_api_PodSpec(in PodSpec, out *PodSpec, c *conversion.Cloner) error
 		out.NodeSelector = nil
 	}
 	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
+	out.NodeName = in.NodeName
 	out.HostNetwork = in.HostNetwork
 	if in.ImagePullSecrets != nil {
 		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))

pkg/api/types.go

@@ -868,10 +868,10 @@ type PodSpec struct {
 	// The pod will be allowed to use secrets referenced by the ServiceAccount
 	ServiceAccount string `json:"serviceAccount"`
 
-	// Host is a request to schedule this pod onto a specific host.  If it is non-empty,
-	// the the scheduler simply schedules this pod onto that host, assuming that it fits
-	// resource requirements.
-	Host string `json:"host,omitempty"`
+	// NodeName is a request to schedule this pod onto a specific node.  If it is non-empty,
+	// the scheduler simply schedules this pod onto that node, assuming that it fits resource
+	// requirements.
+	NodeName string `json:"nodeName,omitempty"`
 	// Uses the host's network namespace. If this option is set, the ports that will be
 	// used must be specified.
 	// Optional: Default to false.

pkg/api/v1/conversion_generated.go

@@ -1513,7 +1513,7 @@ func convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conversi
 		out.NodeSelector = nil
 	}
 	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
+	out.NodeName = in.NodeName
 	out.HostNetwork = in.HostNetwork
 	if in.ImagePullSecrets != nil {
 		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))
@@ -3787,7 +3787,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversi
 		out.NodeSelector = nil
 	}
 	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
+	out.NodeName = in.NodeName
 	out.HostNetwork = in.HostNetwork
 	if in.ImagePullSecrets != nil {
 		out.ImagePullSecrets = make([]api.LocalObjectReference, len(in.ImagePullSecrets))

pkg/api/v1/deep_copy_generated.go

@@ -1305,7 +1305,7 @@ func deepCopy_v1_PodSpec(in PodSpec, out *PodSpec, c *conversion.Cloner) error {
 		out.NodeSelector = nil
 	}
 	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
+	out.NodeName = in.NodeName
 	out.HostNetwork = in.HostNetwork
 	if in.ImagePullSecrets != nil {
 		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))

pkg/api/v1/types.go

@@ -862,10 +862,10 @@ type PodSpec struct {
 	// ServiceAccount is the name of the ServiceAccount to use to run this pod
 	ServiceAccount string `json:"serviceAccount,omitempty" description:"name of the ServiceAccount to use to run this pod"`
 
-	// Host is a request to schedule this pod onto a specific host.  If it is non-empty,
-	// the the scheduler simply schedules this pod onto that host, assuming that it fits
-	// resource requirements.
-	Host string `json:"host,omitempty" description:"host requested for this pod"`
+	// NodeName is a request to schedule this pod onto a specific node.  If it is non-empty,
+	// the scheduler simply schedules this pod onto that node, assuming that it fits resource
+	// requirements.
+	NodeName string `json:"nodeName,omitempty" description:"node requested for this pod"`
 	// Uses the host's network namespace. If this option is set, the ports that will be
 	// used must be specified.
 	// Optional: Default to false.

pkg/api/v1beta1/conversion.go

@@ -226,14 +226,14 @@ func addConversionFuncs() {
 			if err := s.Convert(&in, &out.Manifest, 0); err != nil {
 				return err
 			}
-			out.Host = in.Host
+			out.Host = in.NodeName
 			return nil
 		},
 		func(in *PodState, out *api.PodSpec, s conversion.Scope) error {
 			if err := s.Convert(&in.Manifest, &out, 0); err != nil {
 				return err
 			}
-			out.Host = in.Host
+			out.NodeName = in.Host
 			return nil
 		},
 
@@ -375,8 +375,8 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil {
 				return err
 			}
-			out.DesiredState.Host = in.Spec.Host
-			out.CurrentState.Host = in.Spec.Host
+			out.DesiredState.Host = in.Spec.NodeName
+			out.CurrentState.Host = in.Spec.NodeName
 			out.ServiceAccount = in.Spec.ServiceAccount
 			if err := s.Convert(&in.Status, &out.CurrentState, 0); err != nil {
 				return err
@@ -399,7 +399,7 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.DesiredState.Manifest, &out.Spec, 0); err != nil {
 				return err
 			}
-			out.Spec.Host = in.DesiredState.Host
+			out.Spec.NodeName = in.DesiredState.Host
 			out.Spec.ServiceAccount = in.ServiceAccount
 			if err := s.Convert(&in.CurrentState, &out.Status, 0); err != nil {
 				return err
@@ -504,7 +504,7 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil {
 				return err
 			}
-			out.DesiredState.Host = in.Spec.Host
+			out.DesiredState.Host = in.Spec.NodeName
 			out.ServiceAccount = in.Spec.ServiceAccount
 			if err := s.Convert(&in.Spec.NodeSelector, &out.NodeSelector, 0); err != nil {
 				return err
@@ -521,7 +521,7 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.DesiredState.Manifest, &out.Spec, 0); err != nil {
 				return err
 			}
-			out.Spec.Host = in.DesiredState.Host
+			out.Spec.NodeName = in.DesiredState.Host
 			out.Spec.ServiceAccount = in.ServiceAccount
 			if err := s.Convert(&in.NodeSelector, &out.Spec.NodeSelector, 0); err != nil {
 				return err

pkg/api/v1beta2/conversion.go

@@ -178,8 +178,8 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil {
 				return err
 			}
-			out.DesiredState.Host = in.Spec.Host
-			out.CurrentState.Host = in.Spec.Host
+			out.DesiredState.Host = in.Spec.NodeName
+			out.CurrentState.Host = in.Spec.NodeName
 			out.ServiceAccount = in.Spec.ServiceAccount
 			if err := s.Convert(&in.Status, &out.CurrentState, 0); err != nil {
 				return err
@@ -203,7 +203,7 @@ func addConversionFuncs() {
 				return err
 			}
 			out.Spec.ServiceAccount = in.ServiceAccount
-			out.Spec.Host = in.DesiredState.Host
+			out.Spec.NodeName = in.DesiredState.Host
 			if err := s.Convert(&in.CurrentState, &out.Status, 0); err != nil {
 				return err
 			}
@@ -283,7 +283,7 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.Spec, &out.DesiredState.Manifest, 0); err != nil {
 				return err
 			}
-			out.DesiredState.Host = in.Spec.Host
+			out.DesiredState.Host = in.Spec.NodeName
 			out.ServiceAccount = in.Spec.ServiceAccount
 			if err := s.Convert(&in.Spec.NodeSelector, &out.NodeSelector, 0); err != nil {
 				return err
@@ -300,7 +300,7 @@ func addConversionFuncs() {
 			if err := s.Convert(&in.DesiredState.Manifest, &out.Spec, 0); err != nil {
 				return err
 			}
-			out.Spec.Host = in.DesiredState.Host
+			out.Spec.NodeName = in.DesiredState.Host
 			out.Spec.ServiceAccount = in.ServiceAccount
 			if err := s.Convert(&in.NodeSelector, &out.Spec.NodeSelector, 0); err != nil {
 				return err
@@ -660,14 +660,14 @@ func addConversionFuncs() {
 			if err := s.Convert(&in, &out.Manifest, 0); err != nil {
 				return err
 			}
-			out.Host = in.Host
+			out.Host = in.NodeName
 			return nil
 		},
 		func(in *PodState, out *api.PodSpec, s conversion.Scope) error {
 			if err := s.Convert(&in.Manifest, &out, 0); err != nil {
 				return err
 			}
-			out.Host = in.Host
+			out.NodeName = in.Host
 			return nil
 		},
 		func(in *api.Service, out *Service, s conversion.Scope) error {

pkg/api/v1beta3/conversion.go

@@ -31,6 +31,8 @@ func addConversionFuncs() {
 		convert_api_Container_To_v1beta3_Container,
 		convert_v1beta3_ServiceSpec_To_api_ServiceSpec,
 		convert_api_ServiceSpec_To_v1beta3_ServiceSpec,
+		convert_v1beta3_PodSpec_To_api_PodSpec,
+		convert_api_PodSpec_To_v1beta3_PodSpec,
 	)
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.
@@ -420,3 +422,127 @@ func convert_api_ServiceSpec_To_v1beta3_ServiceSpec(in *api.ServiceSpec, out *Se
 	out.SessionAffinity = ServiceAffinity(in.SessionAffinity)
 	return nil
 }
+
+func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*PodSpec))(in)
+	}
+	if in.Volumes != nil {
+		out.Volumes = make([]api.Volume, len(in.Volumes))
+		for i := range in.Volumes {
+			if err := convert_v1beta3_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.Volumes = nil
+	}
+	if in.Containers != nil {
+		out.Containers = make([]api.Container, len(in.Containers))
+		for i := range in.Containers {
+			if err := convert_v1beta3_Container_To_api_Container(&in.Containers[i], &out.Containers[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.Containers = nil
+	}
+	out.RestartPolicy = api.RestartPolicy(in.RestartPolicy)
+	if in.TerminationGracePeriodSeconds != nil {
+		out.TerminationGracePeriodSeconds = new(int64)
+		*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
+	} else {
+		out.TerminationGracePeriodSeconds = nil
+	}
+	if in.ActiveDeadlineSeconds != nil {
+		out.ActiveDeadlineSeconds = new(int64)
+		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
+	} else {
+		out.ActiveDeadlineSeconds = nil
+	}
+	out.DNSPolicy = api.DNSPolicy(in.DNSPolicy)
+	if in.NodeSelector != nil {
+		out.NodeSelector = make(map[string]string)
+		for key, val := range in.NodeSelector {
+			out.NodeSelector[key] = val
+		}
+	} else {
+		out.NodeSelector = nil
+	}
+	out.ServiceAccount = in.ServiceAccount
+	out.NodeName = in.Host
+	out.HostNetwork = in.HostNetwork
+	if in.ImagePullSecrets != nil {
+		out.ImagePullSecrets = make([]api.LocalObjectReference, len(in.ImagePullSecrets))
+		for i := range in.ImagePullSecrets {
+			if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.ImagePullSecrets = nil
+	}
+	return nil
+}
+
+func convert_api_PodSpec_To_v1beta3_PodSpec(in *api.PodSpec, out *PodSpec, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*api.PodSpec))(in)
+	}
+	if in.Volumes != nil {
+		out.Volumes = make([]Volume, len(in.Volumes))
+		for i := range in.Volumes {
+			if err := convert_api_Volume_To_v1beta3_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.Volumes = nil
+	}
+	if in.Containers != nil {
+		out.Containers = make([]Container, len(in.Containers))
+		for i := range in.Containers {
+			if err := convert_api_Container_To_v1beta3_Container(&in.Containers[i], &out.Containers[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.Containers = nil
+	}
+	out.RestartPolicy = RestartPolicy(in.RestartPolicy)
+	if in.TerminationGracePeriodSeconds != nil {
+		out.TerminationGracePeriodSeconds = new(int64)
+		*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
+	} else {
+		out.TerminationGracePeriodSeconds = nil
+	}
+	if in.ActiveDeadlineSeconds != nil {
+		out.ActiveDeadlineSeconds = new(int64)
+		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
+	} else {
+		out.ActiveDeadlineSeconds = nil
+	}
+	out.DNSPolicy = DNSPolicy(in.DNSPolicy)
+	if in.NodeSelector != nil {
+		out.NodeSelector = make(map[string]string)
+		for key, val := range in.NodeSelector {
+			out.NodeSelector[key] = val
+		}
+	} else {
+		out.NodeSelector = nil
+	}
+	out.ServiceAccount = in.ServiceAccount
+	out.Host = in.NodeName
+	out.HostNetwork = in.HostNetwork
+	if in.ImagePullSecrets != nil {
+		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))
+		for i := range in.ImagePullSecrets {
+			if err := convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil {
+				return err
+			}
+		}
+	} else {
+		out.ImagePullSecrets = nil
+	}
+	return nil
+}

pkg/api/v1beta3/conversion_generated.go

@@ -1373,68 +1373,6 @@ func convert_api_PodProxyOptions_To_v1beta3_PodProxyOptions(in *api.PodProxyOpti
 	return nil
 }
 
-func convert_api_PodSpec_To_v1beta3_PodSpec(in *api.PodSpec, out *PodSpec, s conversion.Scope) error {
-	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*api.PodSpec))(in)
-	}
-	if in.Volumes != nil {
-		out.Volumes = make([]Volume, len(in.Volumes))
-		for i := range in.Volumes {
-			if err := convert_api_Volume_To_v1beta3_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Volumes = nil
-	}
-	if in.Containers != nil {
-		out.Containers = make([]Container, len(in.Containers))
-		for i := range in.Containers {
-			if err := convert_api_Container_To_v1beta3_Container(&in.Containers[i], &out.Containers[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Containers = nil
-	}
-	out.RestartPolicy = RestartPolicy(in.RestartPolicy)
-	if in.TerminationGracePeriodSeconds != nil {
-		out.TerminationGracePeriodSeconds = new(int64)
-		*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
-	} else {
-		out.TerminationGracePeriodSeconds = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		out.ActiveDeadlineSeconds = new(int64)
-		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
-	out.DNSPolicy = DNSPolicy(in.DNSPolicy)
-	if in.NodeSelector != nil {
-		out.NodeSelector = make(map[string]string)
-		for key, val := range in.NodeSelector {
-			out.NodeSelector[key] = val
-		}
-	} else {
-		out.NodeSelector = nil
-	}
-	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
-	out.HostNetwork = in.HostNetwork
-	if in.ImagePullSecrets != nil {
-		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))
-		for i := range in.ImagePullSecrets {
-			if err := convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.ImagePullSecrets = nil
-	}
-	return nil
-}
-
 func convert_api_PodStatus_To_v1beta3_PodStatus(in *api.PodStatus, out *PodStatus, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*api.PodStatus))(in)
@@ -3580,68 +3518,6 @@ func convert_v1beta3_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions,
 	return nil
 }
 
-func convert_v1beta3_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversion.Scope) error {
-	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*PodSpec))(in)
-	}
-	if in.Volumes != nil {
-		out.Volumes = make([]api.Volume, len(in.Volumes))
-		for i := range in.Volumes {
-			if err := convert_v1beta3_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Volumes = nil
-	}
-	if in.Containers != nil {
-		out.Containers = make([]api.Container, len(in.Containers))
-		for i := range in.Containers {
-			if err := convert_v1beta3_Container_To_api_Container(&in.Containers[i], &out.Containers[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Containers = nil
-	}
-	out.RestartPolicy = api.RestartPolicy(in.RestartPolicy)
-	if in.TerminationGracePeriodSeconds != nil {
-		out.TerminationGracePeriodSeconds = new(int64)
-		*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
-	} else {
-		out.TerminationGracePeriodSeconds = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		out.ActiveDeadlineSeconds = new(int64)
-		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
-	out.DNSPolicy = api.DNSPolicy(in.DNSPolicy)
-	if in.NodeSelector != nil {
-		out.NodeSelector = make(map[string]string)
-		for key, val := range in.NodeSelector {
-			out.NodeSelector[key] = val
-		}
-	} else {
-		out.NodeSelector = nil
-	}
-	out.ServiceAccount = in.ServiceAccount
-	out.Host = in.Host
-	out.HostNetwork = in.HostNetwork
-	if in.ImagePullSecrets != nil {
-		out.ImagePullSecrets = make([]api.LocalObjectReference, len(in.ImagePullSecrets))
-		for i := range in.ImagePullSecrets {
-			if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.ImagePullSecrets = nil
-	}
-	return nil
-}
-
 func convert_v1beta3_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*PodStatus))(in)
@@ -4514,7 +4390,6 @@ func init() {
 		convert_api_PodList_To_v1beta3_PodList,
 		convert_api_PodLogOptions_To_v1beta3_PodLogOptions,
 		convert_api_PodProxyOptions_To_v1beta3_PodProxyOptions,
-		convert_api_PodSpec_To_v1beta3_PodSpec,
 		convert_api_PodStatusResult_To_v1beta3_PodStatusResult,
 		convert_api_PodStatus_To_v1beta3_PodStatus,
 		convert_api_PodTemplateList_To_v1beta3_PodTemplateList,
@@ -4626,7 +4501,6 @@ func init() {
 		convert_v1beta3_PodList_To_api_PodList,
 		convert_v1beta3_PodLogOptions_To_api_PodLogOptions,
 		convert_v1beta3_PodProxyOptions_To_api_PodProxyOptions,
-		convert_v1beta3_PodSpec_To_api_PodSpec,
 		convert_v1beta3_PodStatusResult_To_api_PodStatusResult,
 		convert_v1beta3_PodStatus_To_api_PodStatus,
 		convert_v1beta3_PodTemplateList_To_api_PodTemplateList,

pkg/api/validation/validation.go

@@ -1007,8 +1007,8 @@ func ValidatePodStatusUpdate(newPod, oldPod *api.Pod) errs.ValidationErrorList {
 	allErrs = append(allErrs, ValidateObjectMetaUpdate(&oldPod.ObjectMeta, &newPod.ObjectMeta).Prefix("metadata")...)
 
 	// TODO: allow change when bindings are properly decoupled from pods
-	if newPod.Spec.Host != oldPod.Spec.Host {
-		allErrs = append(allErrs, errs.NewFieldInvalid("status.host", newPod.Spec.Host, "pod host cannot be changed directly"))
+	if newPod.Spec.NodeName != oldPod.Spec.NodeName {
+		allErrs = append(allErrs, errs.NewFieldInvalid("status.nodeName", newPod.Spec.NodeName, "pod nodename cannot be changed directly"))
 	}
 
 	// For status update we ignore changes to pod spec.

pkg/api/validation/validation_test.go

@@ -1049,7 +1049,7 @@ func TestValidatePodSpec(t *testing.T) {
 			NodeSelector: map[string]string{
 				"key": "value",
 			},
-			Host:                  "foobar",
+			NodeName:              "foobar",
 			DNSPolicy:             api.DNSClusterFirst,
 			ActiveDeadlineSeconds: &activeDeadlineSeconds,
 		},
@@ -1116,7 +1116,7 @@ func TestValidatePodSpec(t *testing.T) {
 			NodeSelector: map[string]string{
 				"key": "value",
 			},
-			Host:                  "foobar",
+			NodeName:              "foobar",
 			DNSPolicy:             api.DNSClusterFirst,
 			ActiveDeadlineSeconds: &activeDeadlineSeconds,
 		},
@@ -1151,7 +1151,7 @@ func TestValidatePod(t *testing.T) {
 				NodeSelector: map[string]string{
 					"key": "value",
 				},
-				Host: "foobar",
+				NodeName: "foobar",
 			},
 		},
 	}

pkg/cloudprovider/nodecontroller/nodecontroller.go

@@ -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)

pkg/cloudprovider/nodecontroller/nodecontroller_test.go

@@ -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 {

pkg/controller/controller_utils.go

@@ -274,7 +274,7 @@ func (s activePods) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
 
 func (s activePods) Less(i, j int) bool {
 	// Unassigned < assigned
-	if s[i].Spec.Host == "" && s[j].Spec.Host != "" {
+	if s[i].Spec.NodeName == "" && s[j].Spec.NodeName != "" {
 		return true
 	}
 	// PodPending < PodUnknown < PodRunning

pkg/controller/replication_controller_test.go

@@ -404,19 +404,19 @@ func TestSortingActivePods(t *testing.T) {
 		pods[i] = &podList.Items[i]
 	}
 	// pods[0] is not scheduled yet.
-	pods[0].Spec.Host = ""
+	pods[0].Spec.NodeName = ""
 	pods[0].Status.Phase = api.PodPending
 	// pods[1] is scheduled but pending.
-	pods[1].Spec.Host = "bar"
+	pods[1].Spec.NodeName = "bar"
 	pods[1].Status.Phase = api.PodPending
 	// pods[2] is unknown.
-	pods[2].Spec.Host = "foo"
+	pods[2].Spec.NodeName = "foo"
 	pods[2].Status.Phase = api.PodUnknown
 	// pods[3] is running but not ready.
-	pods[3].Spec.Host = "foo"
+	pods[3].Spec.NodeName = "foo"
 	pods[3].Status.Phase = api.PodRunning
 	// pods[4] is running and ready.
-	pods[4].Spec.Host = "foo"
+	pods[4].Spec.NodeName = "foo"
 	pods[4].Status.Phase = api.PodRunning
 	pods[4].Status.Conditions = []api.PodCondition{{Type: api.PodReady, Status: api.ConditionTrue}}
 

pkg/kubectl/cmd/util/helpers_test.go

@@ -67,7 +67,7 @@ func TestMerge(t *testing.T) {
 					Name: "baz",
 				},
 				Spec: api.PodSpec{
-					Host:          "bar",
+					NodeName:      "bar",
 					RestartPolicy: api.RestartPolicyAlways,
 					DNSPolicy:     api.DNSClusterFirst,
 				},

pkg/kubectl/describe.go

@@ -269,7 +269,7 @@ func describePod(pod *api.Pod, rcs []api.ReplicationController, events *api.Even
 	return tabbedString(func(out io.Writer) error {
 		fmt.Fprintf(out, "Name:\t%s\n", pod.Name)
 		fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&pod.Spec))
-		fmt.Fprintf(out, "Host:\t%s\n", pod.Spec.Host+"/"+pod.Status.HostIP)
+		fmt.Fprintf(out, "Node:\t%s\n", pod.Spec.NodeName+"/"+pod.Status.HostIP)
 		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(pod.Labels))
 		fmt.Fprintf(out, "Status:\t%s\n", string(pod.Status.Phase))
 		fmt.Fprintf(out, "Replication Controllers:\t%s\n", printReplicationControllersByLabels(rcs))
@@ -612,7 +612,7 @@ func (d *NodeDescriber) Describe(namespace, name string) (string, error) {
 	}
 	for i := range allPods.Items {
 		pod := &allPods.Items[i]
-		if pod.Spec.Host != name {
+		if pod.Spec.NodeName != name {
 			continue
 		}
 		pods = append(pods, pod)

pkg/kubectl/resource_printer.go

@@ -408,7 +408,7 @@ func printPod(pod *api.Pod, w io.Writer, withNamespace bool) error {
 		name,
 		pod.Status.PodIP,
 		"", "",
-		podHostString(pod.Spec.Host, pod.Status.HostIP),
+		podHostString(pod.Spec.NodeName, pod.Status.HostIP),
 		formatLabels(pod.Labels),
 		pod.Status.Phase,
 		translateTimestamp(pod.CreationTimestamp),

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

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,

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{{

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"},

pkg/registry/generic/etcd/etcd_test.go

@@ -123,11 +123,11 @@ func (everythingMatcher) MatchesSingle() (string, bool) {
 func TestEtcdList(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 	podB := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "bar"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 
 	singleElemListResp := &etcd.Response{
@@ -230,11 +230,11 @@ func TestEtcdList(t *testing.T) {
 func TestEtcdCreate(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 	podB := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault},
-		Spec:       api.PodSpec{Host: "machine2"},
+		Spec:       api.PodSpec{NodeName: "machine2"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -308,11 +308,11 @@ func TestEtcdCreate(t *testing.T) {
 func TestEtcdCreateWithName(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 	podB := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault},
-		Spec:       api.PodSpec{Host: "machine2"},
+		Spec:       api.PodSpec{NodeName: "machine2"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -384,11 +384,11 @@ func TestEtcdCreateWithName(t *testing.T) {
 func TestEtcdUpdate(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 	podB := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault, ResourceVersion: "1"},
-		Spec:       api.PodSpec{Host: "machine2"},
+		Spec:       api.PodSpec{NodeName: "machine2"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -499,11 +499,11 @@ func TestEtcdUpdate(t *testing.T) {
 func TestEtcdUpdateWithName(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 	podB := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
-		Spec:       api.PodSpec{Host: "machine2"},
+		Spec:       api.PodSpec{NodeName: "machine2"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -574,7 +574,7 @@ func TestEtcdUpdateWithName(t *testing.T) {
 func TestEtcdGet(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -630,7 +630,7 @@ func TestEtcdGet(t *testing.T) {
 func TestEtcdDelete(t *testing.T) {
 	podA := &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}
 
 	nodeWithPodA := tools.EtcdResponseWithError{
@@ -699,7 +699,7 @@ func TestEtcdWatch(t *testing.T) {
 				Namespace:       api.NamespaceDefault,
 				ResourceVersion: "1",
 			},
-			Spec: api.PodSpec{Host: "machine"},
+			Spec: api.PodSpec{NodeName: "machine"},
 		}
 		respWithPodA := &etcd.Response{
 			Node: &etcd.Node{

pkg/registry/pod/etcd/etcd.go

@@ -147,10 +147,10 @@ func (r *BindingREST) setPodHostAndAnnotations(ctx api.Context, podID, oldMachin
 		if !ok {
 			return nil, 0, fmt.Errorf("unexpected object: %#v", obj)
 		}
-		if pod.Spec.Host != oldMachine {
-			return nil, 0, fmt.Errorf("pod %v is already assigned to host %q", pod.Name, pod.Spec.Host)
+		if pod.Spec.NodeName != oldMachine {
+			return nil, 0, fmt.Errorf("pod %v is already assigned to node %q", pod.Name, pod.Spec.NodeName)
 		}
-		pod.Spec.Host = machine
+		pod.Spec.NodeName = machine
 		if pod.Annotations == nil {
 			pod.Annotations = make(map[string]string)
 		}

pkg/registry/pod/etcd/etcd_test.go

@@ -231,14 +231,14 @@ func TestListPodList(t *testing.T) {
 					{
 						Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 							ObjectMeta: api.ObjectMeta{Name: "foo"},
-							Spec:       api.PodSpec{Host: "machine"},
+							Spec:       api.PodSpec{NodeName: "machine"},
 							Status:     api.PodStatus{Phase: api.PodRunning},
 						}),
 					},
 					{
 						Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 							ObjectMeta: api.ObjectMeta{Name: "bar"},
-							Spec:       api.PodSpec{Host: "machine"},
+							Spec:       api.PodSpec{NodeName: "machine"},
 						}),
 					},
 				},
@@ -255,10 +255,10 @@ func TestListPodList(t *testing.T) {
 	if len(pods.Items) != 2 {
 		t.Errorf("Unexpected pod list: %#v", pods)
 	}
-	if pods.Items[0].Name != "foo" || pods.Items[0].Status.Phase != api.PodRunning || pods.Items[0].Spec.Host != "machine" {
+	if pods.Items[0].Name != "foo" || pods.Items[0].Status.Phase != api.PodRunning || pods.Items[0].Spec.NodeName != "machine" {
 		t.Errorf("Unexpected pod: %#v", pods.Items[0])
 	}
-	if pods.Items[1].Name != "bar" || pods.Items[1].Spec.Host != "machine" {
+	if pods.Items[1].Name != "bar" || pods.Items[1].Spec.NodeName != "machine" {
 		t.Errorf("Unexpected pod: %#v", pods.Items[1])
 	}
 }
@@ -278,7 +278,7 @@ func TestListPodListSelection(t *testing.T) {
 					})},
 					{Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 						ObjectMeta: api.ObjectMeta{Name: "bar"},
-						Spec:       api.PodSpec{Host: "barhost"},
+						Spec:       api.PodSpec{NodeName: "barhost"},
 					})},
 					{Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 						ObjectMeta: api.ObjectMeta{Name: "baz"},
@@ -388,7 +388,7 @@ func TestPodDecode(t *testing.T) {
 func TestGet(t *testing.T) {
 	expect := validNewPod()
 	expect.Status.Phase = api.PodRunning
-	expect.Spec.Host = "machine"
+	expect.Spec.NodeName = "machine"
 
 	fakeEtcdClient, helper := newHelper(t)
 	key := etcdtest.AddPrefix("/pods/test/foo")
@@ -485,7 +485,7 @@ func TestUpdateWithConflictingNamespace(t *testing.T) {
 			Node: &etcd.Node{
 				Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 					ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "default"},
-					Spec:       api.PodSpec{Host: "machine"},
+					Spec:       api.PodSpec{NodeName: "machine"},
 				}),
 				ModifiedIndex: 1,
 			},
@@ -645,7 +645,7 @@ func TestDeletePod(t *testing.T) {
 						Name:      "foo",
 						Namespace: api.NamespaceDefault,
 					},
-					Spec: api.PodSpec{Host: "machine"},
+					Spec: api.PodSpec{NodeName: "machine"},
 				}),
 				ModifiedIndex: 1,
 				CreatedIndex:  1,
@@ -1035,8 +1035,8 @@ func TestEtcdCreateBinding(t *testing.T) {
 			pod, err := registry.Get(ctx, validNewPod().ObjectMeta.Name)
 			if err != nil {
 				t.Errorf("%s: unexpected error: %v", k, err)
-			} else if pod.(*api.Pod).Spec.Host != test.binding.Target.Name {
-				t.Errorf("%s: expected: %v, got: %v", k, pod.(*api.Pod).Spec.Host, test.binding.Target.Name)
+			} else if pod.(*api.Pod).Spec.NodeName != test.binding.Target.Name {
+				t.Errorf("%s: expected: %v, got: %v", k, pod.(*api.Pod).Spec.NodeName, test.binding.Target.Name)
 			}
 		}
 	}
@@ -1107,7 +1107,7 @@ func TestEtcdUpdateScheduled(t *testing.T) {
 			Namespace: api.NamespaceDefault,
 		},
 		Spec: api.PodSpec{
-			Host: "machine",
+			NodeName: "machine",
 			Containers: []api.Container{
 				{
 					Name:            "foobar",
@@ -1127,7 +1127,7 @@ func TestEtcdUpdateScheduled(t *testing.T) {
 			},
 		},
 		Spec: api.PodSpec{
-			Host: "machine",
+			NodeName: "machine",
 			Containers: []api.Container{
 				{
 					Name:                   "foobar",
@@ -1170,7 +1170,7 @@ func TestEtcdUpdateStatus(t *testing.T) {
 			Namespace: api.NamespaceDefault,
 		},
 		Spec: api.PodSpec{
-			Host: "machine",
+			NodeName: "machine",
 			Containers: []api.Container{
 				{
 					Image:           "foo:v1",
@@ -1190,7 +1190,7 @@ func TestEtcdUpdateStatus(t *testing.T) {
 			},
 		},
 		Spec: api.PodSpec{
-			Host: "machine",
+			NodeName: "machine",
 			Containers: []api.Container{
 				{
 					Image:                  "foo:v2",
@@ -1238,7 +1238,7 @@ func TestEtcdDeletePod(t *testing.T) {
 	key = etcdtest.AddPrefix(key)
 	fakeClient.Set(key, runtime.EncodeOrDie(latest.Codec, &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}), 0)
 	_, err := registry.Delete(ctx, "foo", api.NewDeleteOptions(0))
 	if err != nil {
@@ -1260,7 +1260,7 @@ func TestEtcdDeletePodMultipleContainers(t *testing.T) {
 	key = etcdtest.AddPrefix(key)
 	fakeClient.Set(key, runtime.EncodeOrDie(latest.Codec, &api.Pod{
 		ObjectMeta: api.ObjectMeta{Name: "foo"},
-		Spec:       api.PodSpec{Host: "machine"},
+		Spec:       api.PodSpec{NodeName: "machine"},
 	}), 0)
 	_, err := registry.Delete(ctx, "foo", api.NewDeleteOptions(0))
 	if err != nil {
@@ -1330,13 +1330,13 @@ func TestEtcdList(t *testing.T) {
 					{
 						Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 							ObjectMeta: api.ObjectMeta{Name: "foo"},
-							Spec:       api.PodSpec{Host: "machine"},
+							Spec:       api.PodSpec{NodeName: "machine"},
 						}),
 					},
 					{
 						Value: runtime.EncodeOrDie(latest.Codec, &api.Pod{
 							ObjectMeta: api.ObjectMeta{Name: "bar"},
-							Spec:       api.PodSpec{Host: "machine"},
+							Spec:       api.PodSpec{NodeName: "machine"},
 						}),
 					},
 				},
@@ -1353,8 +1353,8 @@ func TestEtcdList(t *testing.T) {
 	if len(pods.Items) != 2 || pods.Items[0].Name != "foo" || pods.Items[1].Name != "bar" {
 		t.Errorf("Unexpected pod list: %#v", pods)
 	}
-	if pods.Items[0].Spec.Host != "machine" ||
-		pods.Items[1].Spec.Host != "machine" {
+	if pods.Items[0].Spec.NodeName != "machine" ||
+		pods.Items[1].Spec.NodeName != "machine" {
 		t.Errorf("Failed to populate host name.")
 	}
 }

pkg/registry/pod/rest.go

@@ -123,7 +123,7 @@ func MatchPod(label labels.Selector, field fields.Selector) generic.Matcher {
 func PodToSelectableFields(pod *api.Pod) fields.Set {
 	return fields.Set{
 		"metadata.name": pod.Name,
-		"spec.host":     pod.Spec.Host,
+		"spec.host":     pod.Spec.NodeName,
 		"status.phase":  string(pod.Status.Phase),
 	}
 }
@@ -199,7 +199,7 @@ func LogLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter, ct
 			return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
 		}
 	}
-	nodeHost := pod.Spec.Host
+	nodeHost := pod.Spec.NodeName
 	if len(nodeHost) == 0 {
 		// If pod has not been assigned a host, return an empty location
 		return nil, nil, nil
@@ -242,7 +242,7 @@ func ExecLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter, c
 			return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name))
 		}
 	}
-	nodeHost := pod.Spec.Host
+	nodeHost := pod.Spec.NodeName
 	if len(nodeHost) == 0 {
 		// If pod has not been assigned a host, return an empty location
 		return nil, nil, fmt.Errorf("pod %s does not have a host assigned", name)
@@ -284,7 +284,7 @@ func PortForwardLocation(getter ResourceGetter, connInfo client.ConnectionInfoGe
 		return nil, nil, err
 	}
 
-	nodeHost := pod.Spec.Host
+	nodeHost := pod.Spec.NodeName
 	if len(nodeHost) == 0 {
 		// If pod has not been assigned a host, return an empty location
 		return nil, nil, errors.NewBadRequest(fmt.Sprintf("pod %s does not have a host assigned", name))