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

Merge pull request #50367 from gmarek/fed 

Automatic merge from submit-queue (batch tested with PRs 49725, 50367, 50391, 48857, 50181)

Don't call one of pointless conversions

@kubernetes/sig-federation-pr-reviews
pull/6/head
Kubernetes Submit Queue 2017-08-10 01:47:15 -07:00 committed by GitHub
parent 5a25527b9b e742c31f97
commit e2b0d5642a
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
federation/pkg/federation-controller/util/eventsink/eventsink.go
View File

@ -72,12 +72,7 @@ func init() {
}
func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
ret, err := fes.clientset.Core().Events(kubeEvent.Namespace).Create(kubeEvent)
ret, err := fes.clientset.Core().Events(event.Namespace).Create(event)
if err != nil {
return nil, err
}
@ -90,12 +85,7 @@ func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) {
}
func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
ret, err := fes.clientset.Core().Events(kubeEvent.Namespace).Update(kubeEvent)
ret, err := fes.clientset.Core().Events(event.Namespace).Update(event)
if err != nil {
return nil, err
}
@ -108,12 +98,7 @@ func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) {
}
func (fes *FederatedEventSink) Patch(event *v1.Event, data []byte) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
ret, err := fes.clientset.Core().Events(kubeEvent.Namespace).Patch(kubeEvent.Name, types.StrategicMergePatchType, data)
ret, err := fes.clientset.Core().Events(event.Namespace).Patch(event.Name, types.StrategicMergePatchType, data)
if err != nil {
return nil, err
}