Skip to content

Commit a472138

Browse files
authored
Merge pull request kubernetes#92724 from chelseychen/event-e2e
Update Event CRUD tests to use events.k8s.io/v1
2 parents d5f76a9 + b0a0335 commit a472138

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

test/e2e/instrumentation/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ go_library(
1414
importpath = "k8s.io/kubernetes/test/e2e/instrumentation",
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/equality:go_default_library",
1919
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2020
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
22-
"//staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1:go_default_library",
22+
"//staging/src/k8s.io/client-go/kubernetes/typed/events/v1:go_default_library",
2323
"//test/e2e/framework:go_default_library",
2424
"//test/e2e/instrumentation/common:go_default_library",
2525
"//test/e2e/instrumentation/logging:go_default_library",

test/e2e/instrumentation/events.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ import (
2323
"time"
2424

2525
"k8s.io/api/core/v1"
26-
eventsv1beta1 "k8s.io/api/events/v1beta1"
26+
eventsv1 "k8s.io/api/events/v1"
2727
apiequality "k8s.io/apimachinery/pkg/api/equality"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/util/diff"
30-
typedeventsv1beta1 "k8s.io/client-go/kubernetes/typed/events/v1beta1"
30+
typedeventsv1 "k8s.io/client-go/kubernetes/typed/events/v1"
3131
"k8s.io/kubernetes/test/e2e/framework"
3232
"k8s.io/kubernetes/test/e2e/instrumentation/common"
3333

3434
"github.com/onsi/ginkgo"
3535
"k8s.io/apimachinery/pkg/types"
3636
)
3737

38-
func newTestEvent(namespace, name, label string) *eventsv1beta1.Event {
38+
func newTestEvent(namespace, name, label string) *eventsv1.Event {
3939
someTime := metav1.MicroTime{Time: time.Unix(1505828956, 0)}
40-
return &eventsv1beta1.Event{
40+
return &eventsv1.Event{
4141
ObjectMeta: metav1.ObjectMeta{
4242
Name: name,
4343
Labels: map[string]string{
@@ -57,7 +57,7 @@ func newTestEvent(namespace, name, label string) *eventsv1beta1.Event {
5757
}
5858
}
5959

60-
func eventExistsInList(client typedeventsv1beta1.EventInterface, namespace, name string) bool {
60+
func eventExistsInList(client typedeventsv1.EventInterface, namespace, name string) bool {
6161
eventsList, err := client.List(context.TODO(), metav1.ListOptions{
6262
LabelSelector: "testevent-constant=true",
6363
})
@@ -73,12 +73,12 @@ func eventExistsInList(client typedeventsv1beta1.EventInterface, namespace, name
7373

7474
var _ = common.SIGDescribe("Events API", func() {
7575
f := framework.NewDefaultFramework("events")
76-
var client typedeventsv1beta1.EventInterface
77-
var clientAllNamespaces typedeventsv1beta1.EventInterface
76+
var client typedeventsv1.EventInterface
77+
var clientAllNamespaces typedeventsv1.EventInterface
7878

7979
ginkgo.BeforeEach(func() {
80-
client = f.ClientSet.EventsV1beta1().Events(f.Namespace.Name)
81-
clientAllNamespaces = f.ClientSet.EventsV1beta1().Events(metav1.NamespaceAll)
80+
client = f.ClientSet.EventsV1().Events(f.Namespace.Name)
81+
clientAllNamespaces = f.ClientSet.EventsV1().Events(metav1.NamespaceAll)
8282
})
8383

8484
/*

0 commit comments

Comments
 (0)