Skip to content

Commit dcb587e

Browse files
authored
Merge pull request kubernetes#91230 from ii/heyste-create-delete-core-v1-collection-namespaced-event-test
Create deleteCoreV1CollectionNamespacedEvent test+promote - +1 endpoint coverage
2 parents 9901950 + 04627ce commit dcb587e

File tree

5 files changed

+196
-100
lines changed

5 files changed

+196
-100
lines changed

test/conformance/testdata/conformance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@
816816
new message, the check MUST have the update message. The event is deleted and
817817
MUST NOT show up when listing all events.
818818
release: v1.19
819-
file: test/e2e/framework/events/events.go
819+
file: test/e2e/apimachinery/events.go
820820
- testname: Garbage Collector, delete deployment, propagation policy background
821821
codename: '[sig-api-machinery] Garbage collector should delete RS created by deployment
822822
when not orphaning [Conformance]'

test/e2e/apimachinery/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"custom_resource_definition.go",
1818
"discovery.go",
1919
"etcd_failure.go",
20+
"events.go",
2021
"framework.go",
2122
"garbage_collector.go",
2223
"generated_clientset.go",

test/e2e/apimachinery/events.go

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
/*
2+
Copyright 2016 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package apimachinery
18+
19+
import (
20+
"context"
21+
"encoding/json"
22+
"time"
23+
24+
v1 "k8s.io/api/core/v1"
25+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26+
"k8s.io/apimachinery/pkg/util/wait"
27+
"k8s.io/kubernetes/test/e2e/framework"
28+
29+
"github.com/onsi/ginkgo"
30+
"k8s.io/apimachinery/pkg/types"
31+
)
32+
33+
const (
34+
eventRetryPeriod = 1 * time.Second
35+
eventRetryTimeout = 1 * time.Minute
36+
)
37+
38+
var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
39+
f := framework.NewDefaultFramework("events")
40+
41+
/*
42+
Release : v1.19
43+
Testname: Event resource lifecycle
44+
Description: Create an event, the event MUST exist.
45+
The event is patched with a new message, the check MUST have the update message.
46+
The event is deleted and MUST NOT show up when listing all events.
47+
*/
48+
framework.ConformanceIt("should ensure that an event can be fetched, patched, deleted, and listed", func() {
49+
eventTestName := "event-test"
50+
51+
ginkgo.By("creating a test event")
52+
// create a test event in test namespace
53+
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
54+
ObjectMeta: metav1.ObjectMeta{
55+
Name: eventTestName,
56+
Labels: map[string]string{
57+
"testevent-constant": "true",
58+
},
59+
},
60+
Message: "This is a test event",
61+
Reason: "Test",
62+
Type: "Normal",
63+
Count: 1,
64+
InvolvedObject: v1.ObjectReference{
65+
Namespace: f.Namespace.Name,
66+
},
67+
}, metav1.CreateOptions{})
68+
framework.ExpectNoError(err, "failed to create test event")
69+
70+
ginkgo.By("listing all events in all namespaces")
71+
// get a list of Events in all namespaces to ensure endpoint coverage
72+
eventsList, err := f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
73+
LabelSelector: "testevent-constant=true",
74+
})
75+
framework.ExpectNoError(err, "failed list all events")
76+
77+
foundCreatedEvent := false
78+
var eventCreatedName string
79+
for _, val := range eventsList.Items {
80+
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
81+
foundCreatedEvent = true
82+
eventCreatedName = val.ObjectMeta.Name
83+
break
84+
}
85+
}
86+
framework.ExpectEqual(foundCreatedEvent, true, "unable to find the test event")
87+
88+
ginkgo.By("patching the test event")
89+
// patch the event's message
90+
eventPatchMessage := "This is a test event - patched"
91+
eventPatch, err := json.Marshal(map[string]interface{}{
92+
"message": eventPatchMessage,
93+
})
94+
framework.ExpectNoError(err, "failed to marshal the patch JSON payload")
95+
96+
_, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Patch(context.TODO(), eventTestName, types.StrategicMergePatchType, []byte(eventPatch), metav1.PatchOptions{})
97+
framework.ExpectNoError(err, "failed to patch the test event")
98+
99+
ginkgo.By("fetching the test event")
100+
// get event by name
101+
event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(context.TODO(), eventCreatedName, metav1.GetOptions{})
102+
framework.ExpectNoError(err, "failed to fetch the test event")
103+
framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message")
104+
105+
ginkgo.By("deleting the test event")
106+
// delete original event
107+
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Delete(context.TODO(), eventCreatedName, metav1.DeleteOptions{})
108+
framework.ExpectNoError(err, "failed to delete the test event")
109+
110+
ginkgo.By("listing all events in all namespaces")
111+
// get a list of Events list namespace
112+
eventsList, err = f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
113+
LabelSelector: "testevent-constant=true",
114+
})
115+
framework.ExpectNoError(err, "fail to list all events")
116+
foundCreatedEvent = false
117+
for _, val := range eventsList.Items {
118+
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
119+
foundCreatedEvent = true
120+
break
121+
}
122+
}
123+
framework.ExpectEqual(foundCreatedEvent, false, "should not have found test event after deletion")
124+
})
125+
126+
ginkgo.It("should delete a collection of events", func() {
127+
eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"}
128+
129+
ginkgo.By("Create set of events")
130+
// create a test event in test namespace
131+
for _, eventTestName := range eventTestNames {
132+
eventMessage := "This is " + eventTestName
133+
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
134+
135+
ObjectMeta: metav1.ObjectMeta{
136+
Name: eventTestName,
137+
Labels: map[string]string{"testevent-set": "true"},
138+
},
139+
Message: eventMessage,
140+
Reason: "Test",
141+
Type: "Normal",
142+
Count: 1,
143+
InvolvedObject: v1.ObjectReference{
144+
Namespace: f.Namespace.Name,
145+
},
146+
}, metav1.CreateOptions{})
147+
framework.ExpectNoError(err, "failed to create event")
148+
framework.Logf("created %v", eventTestName)
149+
}
150+
151+
ginkgo.By("get a list of Events with a label in the current namespace")
152+
// get a list of events
153+
eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
154+
LabelSelector: "testevent-set=true",
155+
})
156+
framework.ExpectNoError(err, "failed to get a list of events")
157+
158+
framework.ExpectEqual(len(eventList.Items), len(eventTestNames), "looking for expected number of pod templates events")
159+
160+
ginkgo.By("delete collection of events")
161+
// delete collection
162+
163+
framework.Logf("requesting DeleteCollection of events")
164+
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{
165+
LabelSelector: "testevent-set=true"})
166+
framework.ExpectNoError(err, "failed to delete the test event")
167+
168+
ginkgo.By("check that the list of events matches the requested quantity")
169+
170+
err = wait.PollImmediate(eventRetryPeriod, eventRetryTimeout, checkEventListQuantity(f, "testevent-set=true", 0))
171+
framework.ExpectNoError(err, "failed to count required events")
172+
})
173+
174+
})
175+
176+
func checkEventListQuantity(f *framework.Framework, label string, quantity int) func() (bool, error) {
177+
return func() (bool, error) {
178+
var err error
179+
180+
framework.Logf("requesting list of events to confirm quantity")
181+
182+
eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
183+
LabelSelector: label})
184+
185+
if err != nil {
186+
return false, err
187+
}
188+
189+
if len(eventList.Items) != quantity {
190+
return false, err
191+
}
192+
return true, nil
193+
}
194+
}

test/e2e/framework/events/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ go_library(
66
importpath = "k8s.io/kubernetes/test/e2e/framework/events",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//staging/src/k8s.io/api/core/v1:go_default_library",
109
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
11-
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
1210
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
1311
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
14-
"//test/e2e/framework:go_default_library",
15-
"//vendor/github.com/onsi/ginkgo:go_default_library",
1612
],
1713
)
1814

test/e2e/framework/events/events.go

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -18,113 +18,18 @@ package events
1818

1919
import (
2020
"context"
21-
"encoding/json"
2221
"fmt"
2322
"strings"
2423
"time"
2524

26-
v1 "k8s.io/api/core/v1"
2725
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2826
"k8s.io/apimachinery/pkg/util/wait"
2927
clientset "k8s.io/client-go/kubernetes"
30-
"k8s.io/kubernetes/test/e2e/framework"
31-
32-
"github.com/onsi/ginkgo"
33-
"k8s.io/apimachinery/pkg/types"
3428
)
3529

3630
// Action is a function to be performed by the system.
3731
type Action func() error
3832

39-
var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
40-
f := framework.NewDefaultFramework("events")
41-
42-
/*
43-
Release : v1.19
44-
Testname: Event resource lifecycle
45-
Description: Create an event, the event MUST exist.
46-
The event is patched with a new message, the check MUST have the update message.
47-
The event is deleted and MUST NOT show up when listing all events.
48-
*/
49-
framework.ConformanceIt("should ensure that an event can be fetched, patched, deleted, and listed", func() {
50-
eventTestName := "event-test"
51-
52-
ginkgo.By("creating a test event")
53-
// create a test event in test namespace
54-
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
55-
ObjectMeta: metav1.ObjectMeta{
56-
Name: eventTestName,
57-
Labels: map[string]string{
58-
"testevent-constant": "true",
59-
},
60-
},
61-
Message: "This is a test event",
62-
Reason: "Test",
63-
Type: "Normal",
64-
Count: 1,
65-
InvolvedObject: v1.ObjectReference{
66-
Namespace: f.Namespace.Name,
67-
},
68-
}, metav1.CreateOptions{})
69-
framework.ExpectNoError(err, "failed to create test event")
70-
71-
ginkgo.By("listing all events in all namespaces")
72-
// get a list of Events in all namespaces to ensure endpoint coverage
73-
eventsList, err := f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
74-
LabelSelector: "testevent-constant=true",
75-
})
76-
framework.ExpectNoError(err, "failed list all events")
77-
78-
foundCreatedEvent := false
79-
var eventCreatedName string
80-
for _, val := range eventsList.Items {
81-
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
82-
foundCreatedEvent = true
83-
eventCreatedName = val.ObjectMeta.Name
84-
break
85-
}
86-
}
87-
framework.ExpectEqual(foundCreatedEvent, true, "unable to find the test event")
88-
89-
ginkgo.By("patching the test event")
90-
// patch the event's message
91-
eventPatchMessage := "This is a test event - patched"
92-
eventPatch, err := json.Marshal(map[string]interface{}{
93-
"message": eventPatchMessage,
94-
})
95-
framework.ExpectNoError(err, "failed to marshal the patch JSON payload")
96-
97-
_, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Patch(context.TODO(), eventTestName, types.StrategicMergePatchType, []byte(eventPatch), metav1.PatchOptions{})
98-
framework.ExpectNoError(err, "failed to patch the test event")
99-
100-
ginkgo.By("fetching the test event")
101-
// get event by name
102-
event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(context.TODO(), eventCreatedName, metav1.GetOptions{})
103-
framework.ExpectNoError(err, "failed to fetch the test event")
104-
framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message")
105-
106-
ginkgo.By("deleting the test event")
107-
// delete original event
108-
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Delete(context.TODO(), eventCreatedName, metav1.DeleteOptions{})
109-
framework.ExpectNoError(err, "failed to delete the test event")
110-
111-
ginkgo.By("listing all events in all namespaces")
112-
// get a list of Events list namespace
113-
eventsList, err = f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
114-
LabelSelector: "testevent-constant=true",
115-
})
116-
framework.ExpectNoError(err, "fail to list all events")
117-
foundCreatedEvent = false
118-
for _, val := range eventsList.Items {
119-
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
120-
foundCreatedEvent = true
121-
break
122-
}
123-
}
124-
framework.ExpectEqual(foundCreatedEvent, false, "should not have found test event after deletion")
125-
})
126-
})
127-
12833
// WaitTimeoutForEvent waits the given timeout duration for an event to occur.
12934
func WaitTimeoutForEvent(c clientset.Interface, namespace, eventSelector, msg string, timeout time.Duration) error {
13035
interval := 2 * time.Second

0 commit comments

Comments
 (0)