Skip to content

Commit b6cbe1b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#92662 from chelseychen/event-api-fallback
Switch event recorder to use events.k8s.io/v1
2 parents 19883b5 + e54ad20 commit b6cbe1b

File tree

16 files changed

+130
-122
lines changed

16 files changed

+130
-122
lines changed

‎pkg/scheduler/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ go_test(
8080
"//pkg/scheduler/profile:go_default_library",
8181
"//pkg/scheduler/testing:go_default_library",
8282
"//staging/src/k8s.io/api/core/v1:go_default_library",
83-
"//staging/src/k8s.io/api/events/v1beta1:go_default_library",
83+
"//staging/src/k8s.io/api/events/v1:go_default_library",
8484
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
8585
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
8686
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎pkg/scheduler/apis/config/testing/compatibility_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
13331333
},
13341334
}
13351335
informerFactory := informers.NewSharedInformerFactory(client, 0)
1336-
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")}))
1336+
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()}))
13371337

13381338
sched, err := scheduler.New(
13391339
client,
@@ -1509,7 +1509,7 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
15091509

15101510
client := fake.NewSimpleClientset()
15111511
informerFactory := informers.NewSharedInformerFactory(client, 0)
1512-
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")}))
1512+
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()}))
15131513

15141514
sched, err := scheduler.New(
15151515
client,
@@ -1938,7 +1938,7 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
19381938

19391939
client := fake.NewSimpleClientset()
19401940
informerFactory := informers.NewSharedInformerFactory(client, 0)
1941-
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")}))
1941+
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()}))
19421942

19431943
sched, err := scheduler.New(
19441944
client,

‎pkg/scheduler/factory_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ func newConfigFactoryWithFrameworkRegistry(
449449
registry frameworkruntime.Registry) *Configurator {
450450
informerFactory := informers.NewSharedInformerFactory(client, 0)
451451
snapshot := internalcache.NewEmptySnapshot()
452-
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")}))
452+
recorderFactory := profile.NewRecorderFactory(events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()}))
453453
return &Configurator{
454454
client: client,
455455
informerFactory: informerFactory,

‎pkg/scheduler/profile/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ go_test(
3939
"//pkg/scheduler/framework/runtime:go_default_library",
4040
"//pkg/scheduler/framework/v1alpha1:go_default_library",
4141
"//staging/src/k8s.io/api/core/v1:go_default_library",
42-
"//staging/src/k8s.io/api/events/v1beta1:go_default_library",
42+
"//staging/src/k8s.io/api/events/v1:go_default_library",
4343
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
4444
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
4545
"//staging/src/k8s.io/client-go/tools/events:go_default_library",

‎pkg/scheduler/profile/profile_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"testing"
2424

2525
v1 "k8s.io/api/core/v1"
26-
"k8s.io/api/events/v1beta1"
26+
eventsv1 "k8s.io/api/events/v1"
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/client-go/kubernetes/fake"
2929
"k8s.io/client-go/tools/events"
@@ -101,7 +101,7 @@ func TestNewProfile(t *testing.T) {
101101
for _, tc := range cases {
102102
t.Run(tc.name, func(t *testing.T) {
103103
c := fake.NewSimpleClientset()
104-
b := events.NewBroadcaster(&events.EventSinkImpl{Interface: c.EventsV1beta1().Events("")})
104+
b := events.NewBroadcaster(&events.EventSinkImpl{Interface: c.EventsV1()})
105105
p, err := NewProfile(tc.cfg, fakeFrameworkFactory, NewRecorderFactory(b))
106106
if err := checkErr(err, tc.wantErr); err != nil {
107107
t.Fatal(err)
@@ -113,7 +113,7 @@ func TestNewProfile(t *testing.T) {
113113
called := make(chan struct{})
114114
var ctrl string
115115
stopFn := b.StartEventWatcher(func(obj runtime.Object) {
116-
e, _ := obj.(*v1beta1.Event)
116+
e, _ := obj.(*eventsv1.Event)
117117
ctrl = e.ReportingController
118118
close(called)
119119
})

‎pkg/scheduler/scheduler_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
"github.com/google/go-cmp/cmp"
3535
v1 "k8s.io/api/core/v1"
36-
"k8s.io/api/events/v1beta1"
36+
eventsv1 "k8s.io/api/events/v1"
3737
"k8s.io/apimachinery/pkg/api/resource"
3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3939
"k8s.io/apimachinery/pkg/labels"
@@ -173,7 +173,7 @@ func TestSchedulerCreation(t *testing.T) {
173173
client := clientsetfake.NewSimpleClientset()
174174
informerFactory := informers.NewSharedInformerFactory(client, 0)
175175

176-
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")})
176+
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()})
177177

178178
stopCh := make(chan struct{})
179179
defer close(stopCh)
@@ -209,7 +209,7 @@ func TestSchedulerCreation(t *testing.T) {
209209
func TestSchedulerScheduleOne(t *testing.T) {
210210
testNode := v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "machine1", UID: types.UID("machine1")}}
211211
client := clientsetfake.NewSimpleClientset(&testNode)
212-
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")})
212+
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()})
213213
errS := errors.New("scheduler")
214214
errB := errors.New("binder")
215215

@@ -325,7 +325,7 @@ func TestSchedulerScheduleOne(t *testing.T) {
325325
}
326326
called := make(chan struct{})
327327
stopFunc := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
328-
e, _ := obj.(*v1beta1.Event)
328+
e, _ := obj.(*eventsv1.Event)
329329
if e.Reason != item.eventReason {
330330
t.Errorf("got event %v, want %v", e.Reason, item.eventReason)
331331
}
@@ -409,7 +409,7 @@ func TestSchedulerMultipleProfilesScheduling(t *testing.T) {
409409
// We use a fake filter that only allows one particular node. We create two
410410
// profiles, each with a different node in the filter configuration.
411411
client := clientsetfake.NewSimpleClientset(nodes...)
412-
broadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")})
412+
broadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()})
413413
ctx, cancel := context.WithCancel(context.Background())
414414
defer cancel()
415415

@@ -469,7 +469,7 @@ func TestSchedulerMultipleProfilesScheduling(t *testing.T) {
469469
})
470470
controllers := make(map[string]string)
471471
stopFn := broadcaster.StartEventWatcher(func(obj runtime.Object) {
472-
e, ok := obj.(*v1beta1.Event)
472+
e, ok := obj.(*eventsv1.Event)
473473
if !ok || e.Reason != "Scheduled" {
474474
return
475475
}
@@ -847,7 +847,7 @@ func TestSchedulerWithVolumeBinding(t *testing.T) {
847847
bindErr := fmt.Errorf("bind err")
848848
client := clientsetfake.NewSimpleClientset()
849849

850-
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")})
850+
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()})
851851

852852
// This can be small because we wait for pod to finish scheduling first
853853
chanTimeout := 2 * time.Second
@@ -939,7 +939,7 @@ func TestSchedulerWithVolumeBinding(t *testing.T) {
939939
s, bindingChan, errChan := setupTestSchedulerWithVolumeBinding(fakeVolumeBinder, stop, eventBroadcaster)
940940
eventChan := make(chan struct{})
941941
stopFunc := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
942-
e, _ := obj.(*v1beta1.Event)
942+
e, _ := obj.(*eventsv1.Event)
943943
if e, a := item.eventReason, e.Reason; e != a {
944944
t.Errorf("expected %v, got %v", e, a)
945945
}

‎staging/src/k8s.io/client-go/tools/events/BUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ go_library(
1414
visibility = ["//visibility:public"],
1515
deps = [
1616
"//staging/src/k8s.io/api/core/v1:go_default_library",
17-
"//staging/src/k8s.io/api/events/v1beta1:go_default_library",
17+
"//staging/src/k8s.io/api/events/v1:go_default_library",
1818
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
1919
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2020
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
21+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
2122
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
2223
"//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
2324
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
@@ -27,7 +28,7 @@ go_library(
2728
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2829
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
2930
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
30-
"//staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1:go_default_library",
31+
"//staging/src/k8s.io/client-go/kubernetes/typed/events/v1:go_default_library",
3132
"//staging/src/k8s.io/client-go/rest:go_default_library",
3233
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
3334
"//staging/src/k8s.io/client-go/tools/record/util:go_default_library",
@@ -42,7 +43,7 @@ go_test(
4243
embed = [":go_default_library"],
4344
deps = [
4445
"//staging/src/k8s.io/api/core/v1:go_default_library",
45-
"//staging/src/k8s.io/api/events/v1beta1:go_default_library",
46+
"//staging/src/k8s.io/api/events/v1:go_default_library",
4647
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
4748
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
4849
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",

0 commit comments

Comments
 (0)