github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39116 from caesarxuchao/fix-event-expansion 

Automatic merge from submit-queue (batch tested with PRs 41844, 41803, 39116, 41129, 41240)

core/v1/event_expansion.go use v1.GetReference

Fix https://github.com/kubernetes/client-go/issues/47.
pull/6/head
Kubernetes Submit Queue 2017-02-22 05:48:40 -08:00 committed by GitHub
parent af4513cd3f ec00f67ab3
commit e8ff10ce29
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/client/clientset_generated/clientset/typed/core/v1/event_expansion.go
View File

@ -23,7 +23,6 @@ import (
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
)
@ -100,7 +99,7 @@ func (e *events) PatchWithEventNamespace(incompleteEvent *v1.Event, data []byte)
// object must match this event's client namespace unless the event client
// was made with the "" namespace.
func (e *events) Search(scheme *runtime.Scheme, objOrRef runtime.Object) (*v1.EventList, error) {
ref, err := api.GetReference(scheme, objOrRef)
ref, err := v1.GetReference(scheme, objOrRef)
if err != nil {
return nil, err
}

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

@ -23,7 +23,6 @@ import (
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"
)
@ -100,7 +99,7 @@ func (e *events) PatchWithEventNamespace(incompleteEvent *v1.Event, data []byte)
// object must match this event's client namespace unless the event client
// was made with the "" namespace.
func (e *events) Search(scheme *runtime.Scheme, objOrRef runtime.Object) (*v1.EventList, error) {
ref, err := api.GetReference(scheme, objOrRef)
ref, err := v1.GetReference(scheme, objOrRef)
if err != nil {
return nil, err
}