Merge pull request #5555 from fgrzadkowski/sync_pod_status

Periodically update pod status from kubelet.
2015-03-18 10:14:07 -07:00
parent e92067d102 1a352b74ba
commit 9586b39bb7
12 changed files with 95 additions and 47 deletions
--- a/pkg/api/validation/validation.go
+++ b/pkg/api/validation/validation.go
@@ -691,6 +691,7 @@ func ValidatePodStatusUpdate(newPod, oldPod *api.Pod) errs.ValidationErrorList {
 		allErrs = append(allErrs, errs.NewFieldInvalid("status.host", newPod.Status.Host, "pod host cannot be changed directly"))
 	}

+	// For status update we ignore changes to pod spec.
 	newPod.Spec = oldPod.Spec

 	return allErrs