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

Merge pull request #78716 from liggitt/log-gc-test

Browse Source 
Add integration test for propagationPolicy=Orphan GC
This commit is contained in:
Kubernetes Prow Robot 2019-06-14 15:25:44 -07:00 committed by GitHub
commit 1feb3b4016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/garbagecollector/garbage_collector_test.go
View File

@ -60,6 +60,11 @@ func getOrphanOptions() *metav1.DeleteOptions {
return &metav1.DeleteOptions{OrphanDependents: &trueVar} return &metav1.DeleteOptions{OrphanDependents: &trueVar}
} }
func getPropagateOrphanOptions() *metav1.DeleteOptions {
policy := metav1.DeletePropagationOrphan
return &metav1.DeleteOptions{PropagationPolicy: &policy}
}
func getNonOrphanOptions() *metav1.DeleteOptions { func getNonOrphanOptions() *metav1.DeleteOptions {
var falseVar = false var falseVar = false
return &metav1.DeleteOptions{OrphanDependents: &falseVar} return &metav1.DeleteOptions{OrphanDependents: &falseVar}
@ -454,6 +459,9 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
case options.OrphanDependents != nil: case options.OrphanDependents != nil:
// if the deletion options explicitly specify whether to orphan, that controls // if the deletion options explicitly specify whether to orphan, that controls
orphan = *options.OrphanDependents orphan = *options.OrphanDependents
case options.PropagationPolicy != nil:
// if the deletion options explicitly specify whether to orphan, that controls
orphan = *options.PropagationPolicy == metav1.DeletePropagationOrphan
case len(initialFinalizers) != 0 && initialFinalizers[0] == metav1.FinalizerOrphanDependents: case len(initialFinalizers) != 0 && initialFinalizers[0] == metav1.FinalizerOrphanDependents:
// if the orphan finalizer is explicitly added, we orphan // if the orphan finalizer is explicitly added, we orphan
orphan = true orphan = true
@ -517,8 +525,8 @@ func TestStressingCascadingDeletion(t *testing.T) {
const collections = 10 const collections = 10
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(collections * 4) wg.Add(collections * 5)
rcUIDs := make(chan types.UID, collections*4) rcUIDs := make(chan types.UID, collections*5)
for i := 0; i < collections; i++ { for i := 0; i < collections; i++ {
// rc is created with empty finalizers, deleted with nil delete options, pods will remain. // rc is created with empty finalizers, deleted with nil delete options, pods will remain.
go setupRCsPods(t, gc, clientSet, "collection1-"+strconv.Itoa(i), ns.Name, []string{}, nil, &wg, rcUIDs) go setupRCsPods(t, gc, clientSet, "collection1-"+strconv.Itoa(i), ns.Name, []string{}, nil, &wg, rcUIDs)
@ -528,6 +536,8 @@ func TestStressingCascadingDeletion(t *testing.T) {
go setupRCsPods(t, gc, clientSet, "collection3-"+strconv.Itoa(i), ns.Name, []string{metav1.FinalizerOrphanDependents}, getNonOrphanOptions(), &wg, rcUIDs) go setupRCsPods(t, gc, clientSet, "collection3-"+strconv.Itoa(i), ns.Name, []string{metav1.FinalizerOrphanDependents}, getNonOrphanOptions(), &wg, rcUIDs)
// rc is created with empty finalizers, deleted with DeleteOptions.OrphanDependents=true, pods will remain. // rc is created with empty finalizers, deleted with DeleteOptions.OrphanDependents=true, pods will remain.
go setupRCsPods(t, gc, clientSet, "collection4-"+strconv.Itoa(i), ns.Name, []string{}, getOrphanOptions(), &wg, rcUIDs) go setupRCsPods(t, gc, clientSet, "collection4-"+strconv.Itoa(i), ns.Name, []string{}, getOrphanOptions(), &wg, rcUIDs)
// rc is created with empty finalizers, deleted with DeleteOptions.PropagationPolicy=Orphan, pods will remain.
go setupRCsPods(t, gc, clientSet, "collection5-"+strconv.Itoa(i), ns.Name, []string{}, getPropagateOrphanOptions(), &wg, rcUIDs)
} }
wg.Wait() wg.Wait()
t.Logf("all pods are created, all replications controllers are created then deleted") t.Logf("all pods are created, all replications controllers are created then deleted")
@ -535,7 +545,7 @@ func TestStressingCascadingDeletion(t *testing.T) {
if err := wait.Poll(1*time.Second, 300*time.Second, func() (bool, error) { if err := wait.Poll(1*time.Second, 300*time.Second, func() (bool, error) {
podsInEachCollection := 3 podsInEachCollection := 3
// see the comments on the calls to setupRCsPods for details // see the comments on the calls to setupRCsPods for details
remainingGroups := 3 remainingGroups := 4
return verifyRemainingObjects(t, clientSet, ns.Name, 0, collections*podsInEachCollection*remainingGroups) return verifyRemainingObjects(t, clientSet, ns.Name, 0, collections*podsInEachCollection*remainingGroups)
}); err != nil { }); err != nil {
t.Fatal(err) t.Fatal(err)
@ -549,7 +559,7 @@ func TestStressingCascadingDeletion(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
for _, pod := range pods.Items { for _, pod := range pods.Items {
if !strings.Contains(pod.ObjectMeta.Name, "collection1-") && !strings.Contains(pod.ObjectMeta.Name, "collection2-") && !strings.Contains(pod.ObjectMeta.Name, "collection4-") { if !strings.Contains(pod.ObjectMeta.Name, "collection1-") && !strings.Contains(pod.ObjectMeta.Name, "collection2-") && !strings.Contains(pod.ObjectMeta.Name, "collection4-") && !strings.Contains(pod.ObjectMeta.Name, "collection5-") {
t.Errorf("got unexpected remaining pod: %#v", pod) t.Errorf("got unexpected remaining pod: %#v", pod)
} }
} }