github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17819 from mqliang/eventValidate

Browse Source 
remove TODO: There is no namespace required for node.
This commit is contained in:
Marek Grabowski
2015-12-03 09:22:06 +01:00
parent 66877c2064 8547a5c1ae
commit 813a4c9d19
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/validation/events.go
View File

@@ -24,7 +24,11 @@ import (
// ValidateEvent makes sure that the event makes sense. // ValidateEvent makes sure that the event makes sense.
func ValidateEvent(event *api.Event) validation.ErrorList { func ValidateEvent(event *api.Event) validation.ErrorList {
allErrs := validation.ErrorList{} allErrs := validation.ErrorList{}
// TODO: There is no namespace required for node. // There is no namespace required for node.
if event.InvolvedObject.Kind == "Node" &&
event.Namespace != "" {
allErrs = append(allErrs, validation.NewInvalidError("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace is not required for node"))
}
if event.InvolvedObject.Kind != "Node" && if event.InvolvedObject.Kind != "Node" &&
event.Namespace != event.InvolvedObject.Namespace { event.Namespace != event.InvolvedObject.Namespace {
allErrs = append(allErrs, validation.NewInvalidError("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace does not match involvedObject")) allErrs = append(allErrs, validation.NewInvalidError("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace does not match involvedObject"))

2
test/integration/auth_test.go
View File

@@ -173,7 +173,7 @@ var aEvent string = `
"name": "a"%s "name": "a"%s
}, },
"involvedObject": { "involvedObject": {
"kind": "Node", "kind": "Pod",
"namespace": "default", "namespace": "default",
"name": "a", "name": "a",
"apiVersion": "v1" "apiVersion": "v1"