Skip to content

K
k3s
Commit e2b0d564 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 5a25527b e742c31f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 18 deletions
federation/pkg/federation-controller/util/eventsink/eventsink.go
View file @ e2b0d564
...@@ -72,12 +72,7 @@ func init() { ...@@ -72,12 +72,7 @@ func init() {
} }
func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) { func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{} ret, err := fes.clientset.Core().Events(event.Namespace).Create(event)
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
ret, err := fes.clientset.Core().Events(kubeEvent.Namespace).Create(kubeEvent)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -90,12 +85,7 @@ func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) { ...@@ -90,12 +85,7 @@ func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) {
} }
func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) { func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{} ret, err := fes.clientset.Core().Events(event.Namespace).Update(event)
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
ret, err := fes.clientset.Core().Events(kubeEvent.Namespace).Update(kubeEvent)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -108,12 +98,7 @@ func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) { ...@@ -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) { func (fes *FederatedEventSink) Patch(event *v1.Event, data []byte) (*v1.Event, error) {
kubeEvent := &v1.Event{} ret, err := fes.clientset.Core().Events(event.Namespace).Patch(event.Name, types.StrategicMergePatchType, data)
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)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment