github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107444 from sayaoailun/master

Browse Source 
fix comment of e2e test case garbage_collector
This commit is contained in:
Kubernetes Prow Robot 2022-05-03 17:18:23 -07:00 committed by GitHub
commit 70ca1dbb81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/conformance/testdata/conformance.yaml vendored
View File

@ -359,7 +359,7 @@
between 10 and 100 replicas. Create second replication controller RC2 and set between 10 and 100 replicas. Create second replication controller RC2 and set
RC2 as owner for half of those replicas. Once RC1 is created and the all Pods RC2 as owner for half of those replicas. Once RC1 is created and the all Pods
are created, delete RC1 with deleteOptions.PropagationPolicy set to Foreground. are created, delete RC1 with deleteOptions.PropagationPolicy set to Foreground.
Half of the Pods that has RC2 as owner MUST not be deleted but have a deletion Half of the Pods that has RC2 as owner MUST not be deleted or have a deletion
timestamp. Deleting the Replication Controller MUST not delete Pods that are owned timestamp. Deleting the Replication Controller MUST not delete Pods that are owned
by multiple replication controllers. by multiple replication controllers.
release: v1.9 release: v1.9

2
test/e2e/apimachinery/garbage_collector.go
View File

@ -730,7 +730,7 @@ var _ = SIGDescribe("Garbage collector", func() {
/* /*
Release: v1.9 Release: v1.9
Testname: Garbage Collector, multiple owners Testname: Garbage Collector, multiple owners
Description: Create a replication controller RC1, with maximum allocatable Pods between 10 and 100 replicas. Create second replication controller RC2 and set RC2 as owner for half of those replicas. Once RC1 is created and the all Pods are created, delete RC1 with deleteOptions.PropagationPolicy set to Foreground. Half of the Pods that has RC2 as owner MUST not be deleted but have a deletion timestamp. Deleting the Replication Controller MUST not delete Pods that are owned by multiple replication controllers. Description: Create a replication controller RC1, with maximum allocatable Pods between 10 and 100 replicas. Create second replication controller RC2 and set RC2 as owner for half of those replicas. Once RC1 is created and the all Pods are created, delete RC1 with deleteOptions.PropagationPolicy set to Foreground. Half of the Pods that has RC2 as owner MUST not be deleted or have a deletion timestamp. Deleting the Replication Controller MUST not delete Pods that are owned by multiple replication controllers.
*/ */
framework.ConformanceIt("should not delete dependents that have both valid owner and owner that's waiting for dependents to be deleted", func() { framework.ConformanceIt("should not delete dependents that have both valid owner and owner that's waiting for dependents to be deleted", func() {
clientSet := f.ClientSet clientSet := f.ClientSet