From b14b436f84a15c8398799acd46a15d7199bf25d6 Mon Sep 17 00:00:00 2001 From: Harold Cheng Date: Wed, 3 Sep 2025 17:48:29 +0800 Subject: [PATCH 1/3] try to fix --- pkg/testutil/apps/common_util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/testutil/apps/common_util.go b/pkg/testutil/apps/common_util.go index 230f8ae0a37..4d008667677 100644 --- a/pkg/testutil/apps/common_util.go +++ b/pkg/testutil/apps/common_util.go @@ -335,7 +335,7 @@ func ClearResourcesWithRemoveFinalizerOption[T intctrlutil.Object, PT intctrluti pobj := PT(&obj) if pobj.GetDeletionTimestamp().IsZero() { d, _ := json.Marshal(pobj) - panic("expected DeletionTimestamp is not nil, obj: " + string(d)) + ginkgo.GinkgoWriter.Printf("Warning: deleted obj's DeletionTimestamp is nil. This may due to an old reconciliation process is not done. obj: %s", string(d)) } finalizers := pobj.GetFinalizers() if len(finalizers) > 0 { From 6463d11a42737ce77b449b1217887455d41c5272 Mon Sep 17 00:00:00 2001 From: Harold Cheng Date: Thu, 16 Oct 2025 17:41:32 +0800 Subject: [PATCH 2/3] Revert "try to fix" This reverts commit b14b436f84a15c8398799acd46a15d7199bf25d6. --- pkg/testutil/apps/common_util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/testutil/apps/common_util.go b/pkg/testutil/apps/common_util.go index 4d008667677..230f8ae0a37 100644 --- a/pkg/testutil/apps/common_util.go +++ b/pkg/testutil/apps/common_util.go @@ -335,7 +335,7 @@ func ClearResourcesWithRemoveFinalizerOption[T intctrlutil.Object, PT intctrluti pobj := PT(&obj) if pobj.GetDeletionTimestamp().IsZero() { d, _ := json.Marshal(pobj) - ginkgo.GinkgoWriter.Printf("Warning: deleted obj's DeletionTimestamp is nil. This may due to an old reconciliation process is not done. obj: %s", string(d)) + panic("expected DeletionTimestamp is not nil, obj: " + string(d)) } finalizers := pobj.GetFinalizers() if len(finalizers) > 0 { From 90c3bebdf57eb6caa6e967709a78136ea7b1aef8 Mon Sep 17 00:00:00 2001 From: Harold Cheng Date: Mon, 20 Oct 2025 10:33:09 +0800 Subject: [PATCH 3/3] do not clear finalizer --- controllers/apps/component/component_controller_test.go | 2 +- pkg/testutil/apps/common_util.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/controllers/apps/component/component_controller_test.go b/controllers/apps/component/component_controller_test.go index b785caf3fcd..a487fadd4b5 100644 --- a/controllers/apps/component/component_controller_test.go +++ b/controllers/apps/component/component_controller_test.go @@ -98,7 +98,7 @@ var _ = Describe("Component Controller", func() { By("clean resources") // delete components (and all dependent sub-resources), and component definitions & versions - testapps.ClearComponentResourcesWithRemoveFinalizerOption(&testCtx) + testapps.ClearComponentResources(&testCtx) // delete rest mocked objects inNS := client.InNamespace(testCtx.DefaultNamespace) diff --git a/pkg/testutil/apps/common_util.go b/pkg/testutil/apps/common_util.go index 230f8ae0a37..cc8c43d0344 100644 --- a/pkg/testutil/apps/common_util.go +++ b/pkg/testutil/apps/common_util.go @@ -373,6 +373,14 @@ func ClearClusterResourcesWithRemoveFinalizerOption(testCtx *testutil.TestContex ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentVersionSignature, true, hasLabels) } +func ClearComponentResources(testCtx *testutil.TestContext) { + inNs := client.InNamespace(testCtx.DefaultNamespace) + hasLabels := client.HasLabels{testCtx.TestObjLabelKey} + ClearResources(testCtx, intctrlutil.ComponentSignature, inNs, hasLabels) + ClearResources(testCtx, intctrlutil.ComponentDefinitionSignature, hasLabels) + ClearResources(testCtx, intctrlutil.ComponentVersionSignature, hasLabels) +} + // ClearComponentResourcesWithRemoveFinalizerOption clears all dependent resources belonging to existing components. func ClearComponentResourcesWithRemoveFinalizerOption(testCtx *testutil.TestContext) { inNs := client.InNamespace(testCtx.DefaultNamespace)