github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-16 06:23:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110649 from harshanarayana/fix/GIT-110335-fix-fake-event-expansion

Browse Source 
client-go: Modify FakeEvents to Work Event Sink started with `""` namespace

Kubernetes-commit: 0e7bb163e38cde20712ce29e918e10ec5c82f3eb
This commit is contained in:
Kubernetes Publisher 2022-07-18 19:52:12 -07:00
commit 0cfc9635b9
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -24,7 +24,7 @@ require (
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.0
k8s.io/api v0.0.0-20220714170823-fa32a3acacac
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
@ -61,6 +61,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220714170823-fa32a3acacac
k8s.io/api => k8s.io/api v0.0.0-20220722161207-096c9df2b1e5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273
)

4
go.sum
View File

@ -479,8 +479,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220714170823-fa32a3acacac h1:LIfq5iBuTwIQYWgnehi7csEnj8JQMdkGELY6R4CJ6zU=
k8s.io/api v0.0.0-20220714170823-fa32a3acacac/go.mod h1:xlTZXhM5RKsAvY03javUnK13iE/4mnhKPPE4oPaILYs=
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5 h1:b/hnNZkm+3G4euPDgrtSZ1N++B690LP192H2PmGr7tY=
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5/go.mod h1:T8MHEjNPDTNfRwP5bawgzpmK7k3NMdSd2grr9aNemC0=
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273 h1:IL+NsyWP9+VKUqvJnCbf/nqFSnRR4lVGR5yjkip3NJo=
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273/go.mod h1:CNcND3K8ABL1dV2TGPzpp/lCzp9PRs+3Wo/Xn4dxzxA=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

18
kubernetes/typed/core/v1/fake/fake_event_expansion.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package fake
import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
@ -26,9 +26,11 @@ import (
)
func (c *FakeEvents) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) {
action := core.NewRootCreateAction(eventsResource, event)
var action core.CreateActionImpl
if c.ns != "" {
action = core.NewCreateAction(eventsResource, c.ns, event)
} else {
action = core.NewCreateAction(eventsResource, event.GetNamespace(), event)
}
obj, err := c.Fake.Invokes(action, event)
if obj == nil {
@ -40,9 +42,11 @@ func (c *FakeEvents) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error
// Update replaces an existing event. Returns the copy of the event the server returns, or an error.
func (c *FakeEvents) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) {
action := core.NewRootUpdateAction(eventsResource, event)
var action core.UpdateActionImpl
if c.ns != "" {
action = core.NewUpdateAction(eventsResource, c.ns, event)
} else {
action = core.NewUpdateAction(eventsResource, event.GetNamespace(), event)
}
obj, err := c.Fake.Invokes(action, event)
if obj == nil {
@ -57,9 +61,11 @@ func (c *FakeEvents) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error
func (c *FakeEvents) PatchWithEventNamespace(event *v1.Event, data []byte) (*v1.Event, error) {
// TODO: Should be configurable to support additional patch strategies.
pt := types.StrategicMergePatchType
action := core.NewRootPatchAction(eventsResource, event.Name, pt, data)
var action core.PatchActionImpl
if c.ns != "" {
action = core.NewPatchAction(eventsResource, c.ns, event.Name, pt, data)
} else {
action = core.NewPatchAction(eventsResource, event.GetNamespace(), event.Name, pt, data)
}
obj, err := c.Fake.Invokes(action, event)
if obj == nil {
@ -71,9 +77,11 @@ func (c *FakeEvents) PatchWithEventNamespace(event *v1.Event, data []byte) (*v1.
// Search returns a list of events matching the specified object.
func (c *FakeEvents) Search(scheme *runtime.Scheme, objOrRef runtime.Object) (*v1.EventList, error) {
action := core.NewRootListAction(eventsResource, eventsKind, metav1.ListOptions{})
var action core.ListActionImpl
if c.ns != "" {
action = core.NewListAction(eventsResource, eventsKind, c.ns, metav1.ListOptions{})
} else {
action = core.NewListAction(eventsResource, eventsKind, v1.NamespaceDefault, metav1.ListOptions{})
}
obj, err := c.Fake.Invokes(action, &v1.EventList{})
if obj == nil {