github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104507 from wzshiming/fix/match

Browse Source 
Check namespaces match in UpdateWithEventNamespace
This commit is contained in:
Kubernetes Prow Robot 2021-09-27 09:05:35 -07:00 committed by GitHub
commit 04f3d19bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event_expansion.go
View File

@ -66,6 +66,9 @@ func (e *events) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) {
// created with the "" namespace. Update also requires the ResourceVersion to be set in the event // created with the "" namespace. Update also requires the ResourceVersion to be set in the event
// object. // object.
func (e *events) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) { func (e *events) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) {
if e.ns != "" && event.Namespace != e.ns {
return nil, fmt.Errorf("can't update an event with namespace '%v' in namespace '%v'", event.Namespace, e.ns)
}
result := &v1.Event{} result := &v1.Event{}
err := e.client.Put(). err := e.client.Put().
NamespaceIfScoped(event.Namespace, len(event.Namespace) > 0). NamespaceIfScoped(event.Namespace, len(event.Namespace) > 0).