Skip to content

Commit 16e9c68

Browse files
authored
Merge pull request kubernetes#99495 from wojtek-t/cleanup_describe_8
Move ownership of core events test to sig-instrumentation
2 parents 4d969ac + 5696261 commit 16e9c68

File tree

4 files changed

+23
-41
lines changed

4 files changed

+23
-41
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4+
- sig-instrumentation-approvers
45
- yastij
56
- wojtek-t
67
reviewers:
8+
- sig-instrumentation-reviewers
79
- yastij
810
- wojtek-t
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,6 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
reviewers:
4-
- lavalamp
5-
- smarterclayton
6-
- wojtek-t
7-
- deads2k
8-
- derekwaynecarr
9-
- caesarxuchao
10-
- vishh
11-
- mikedanese
12-
- liggitt
13-
- erictune
14-
- pmorie
15-
- dchen1107
16-
- saad-ali
17-
- luxas
18-
- yifan-gu
19-
- mwielgus
20-
- timothysc
21-
- jsafrane
22-
- dims
23-
- krousey
24-
- a-robinson
25-
- aveshagarwal
26-
- resouer
27-
- cjcullen
4+
- sig-instrumentation-reviewers
5+
approvers:
6+
- sig-instrumentation-approvers

test/conformance/testdata/conformance.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -317,21 +317,6 @@
317317
return a valid PreferredVersion unless the group suffix is example.com.
318318
release: v1.19
319319
file: test/e2e/apimachinery/discovery.go
320-
- testname: Event, delete a collection
321-
codename: '[sig-api-machinery] Events should delete a collection of events [Conformance]'
322-
description: A set of events is created with a label selector which MUST be found
323-
when listed. The set of events is deleted and MUST NOT show up when listed by
324-
its label selector.
325-
release: v1.20
326-
file: test/e2e/apimachinery/events.go
327-
- testname: Event resource lifecycle
328-
codename: '[sig-api-machinery] Events should ensure that an event can be fetched,
329-
patched, deleted, and listed [Conformance]'
330-
description: Create an event, the event MUST exist. The event is patched with a
331-
new message, the check MUST have the update message. The event is deleted and
332-
MUST NOT show up when listing all events.
333-
release: v1.20
334-
file: test/e2e/apimachinery/events.go
335320
- testname: Garbage Collector, delete deployment, propagation policy background
336321
codename: '[sig-api-machinery] Garbage collector should delete RS created by deployment
337322
when not orphaning [Conformance]'
@@ -1095,6 +1080,21 @@
10951080
show up when listing all events.
10961081
release: v1.19
10971082
file: test/e2e/instrumentation/events.go
1083+
- testname: Event, delete a collection
1084+
codename: '[sig-instrumentation] Events should delete a collection of events [Conformance]'
1085+
description: A set of events is created with a label selector which MUST be found
1086+
when listed. The set of events is deleted and MUST NOT show up when listed by
1087+
its label selector.
1088+
release: v1.20
1089+
file: test/e2e/instrumentation/core_events.go
1090+
- testname: Event resource lifecycle
1091+
codename: '[sig-instrumentation] Events should ensure that an event can be fetched,
1092+
patched, deleted, and listed [Conformance]'
1093+
description: Create an event, the event MUST exist. The event is patched with a
1094+
new message, the check MUST have the update message. The event is deleted and
1095+
MUST NOT show up when listing all events.
1096+
release: v1.20
1097+
file: test/e2e/instrumentation/core_events.go
10981098
- testname: DNS, cluster
10991099
codename: '[sig-network] DNS should provide /etc/hosts entries for the cluster [LinuxOnly]
11001100
[Conformance]'

test/e2e/apimachinery/events.go renamed to test/e2e/instrumentation/core_events.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package apimachinery
17+
package instrumentation
1818

1919
import (
2020
"context"
@@ -25,6 +25,7 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/kubernetes/test/e2e/framework"
28+
"k8s.io/kubernetes/test/e2e/instrumentation/common"
2829

2930
"github.com/onsi/ginkgo"
3031
"k8s.io/apimachinery/pkg/types"
@@ -35,7 +36,7 @@ const (
3536
eventRetryTimeout = 1 * time.Minute
3637
)
3738

38-
var _ = SIGDescribe("Events", func() {
39+
var _ = common.SIGDescribe("Events", func() {
3940
f := framework.NewDefaultFramework("events")
4041

4142
/*

0 commit comments

Comments
 (0)