Merge pull request #6026 from dchen1107/clean

kubectl describe nodes id reports related events
This commit is contained in:
Vish Kannan
2015-03-26 17:39:21 -07:00
3 changed files with 15 additions and 4 deletions

View File

@@ -25,7 +25,9 @@ import (
// ValidateEvent makes sure that the event makes sense.
func ValidateEvent(event *api.Event) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}
if event.Namespace != event.InvolvedObject.Namespace {
// TODO: There is no namespace required for minion
if event.InvolvedObject.Kind != "Node" &&
event.Namespace != event.InvolvedObject.Namespace {
allErrs = append(allErrs, errs.NewFieldInvalid("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace does not match involvedObject"))
}
if !util.IsDNS1123Subdomain(event.Namespace) {