fix: fast namespace deletion (part 2) (#2621)

eddycharly · web-flow · commit 444c66eff7bc · 2026-01-13T11:53:46.000+01:00
* fix: fast namespace deletion (part 2)

Signed-off-by: Charles-Edouard Brétéché &lt;charles.edouard@nirmata.com&gt;

* fix tests

Signed-off-by: Charles-Edouard Brétéché &lt;charles.edouard@nirmata.com&gt;

---------

Signed-off-by: Charles-Edouard Brétéché &lt;charles.edouard@nirmata.com&gt;
diff --git a/.crds/chainsaw.kyverno.io_configurations.yaml b/.crds/chainsaw.kyverno.io_configurations.yaml
@@ -874,6 +874,9 @@ spec:
                 description: FailFast determines whether the test should stop upon
                   encountering the first failure.
                 type: boolean
+              fastNamespaceDeletion:
+                description: FastNamespaceDeletion skips waiting for namespace deletion.
+                type: boolean
               forceTerminationGracePeriod:
                 description: ForceTerminationGracePeriod forces the termination grace
                   period on pods, statefulsets, daemonsets and deployments.
@@ -890,7 +893,7 @@ spec:
                 description: |-
                   Namespace defines the namespace to use for tests.
                   If not specified, every test will execute in a random ephemeral namespace
-                  unless the namespace is overridden in a the test spec.
+                  unless the namespace is overridden in the test spec.
                 type: string
               namespaceTemplate:
                 description: NamespaceTemplate defines a template to create the test
@@ -1912,6 +1915,9 @@ spec:
                     - jp
                     - cel
                     type: string
+                  fastDelete:
+                    description: FastDelete skips waiting for namespace deletion.
+                    type: boolean
                   name:
                     description: |-
                       Name defines the namespace to use for tests.
diff --git a/.crds/chainsaw.kyverno.io_tests.yaml b/.crds/chainsaw.kyverno.io_tests.yaml
@@ -905,6 +905,9 @@ spec:
                 description: FailFast determines whether the test should stop upon
                   encountering the first failure.
                 type: boolean
+              fastNamespaceDeletion:
+                description: FastNamespaceDeletion skips waiting for namespace deletion.
+                type: boolean
               forceTerminationGracePeriod:
                 description: ForceTerminationGracePeriod forces the termination grace
                   period on pods, statefulsets, daemonsets and deployments.
diff --git a/.schemas/json/configuration-chainsaw-v1alpha1.json b/.schemas/json/configuration-chainsaw-v1alpha1.json
@@ -1729,6 +1729,13 @@
             "null"
           ]
         },
+        "fastNamespaceDeletion": {
+          "description": "FastNamespaceDeletion skips waiting for namespace deletion.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "forceTerminationGracePeriod": {
           "description": "ForceTerminationGracePeriod forces the termination grace period on pods, statefulsets, daemonsets and deployments.",
           "type": [
@@ -1751,7 +1758,7 @@
           ]
         },
         "namespace": {
-          "description": "Namespace defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in a the test spec.",
+          "description": "Namespace defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in the test spec.",
           "type": [
             "string",
             "null"
diff --git a/.schemas/json/configuration-chainsaw-v1alpha2.json b/.schemas/json/configuration-chainsaw-v1alpha2.json
@@ -1846,6 +1846,13 @@
                 "cel"
               ]
             },
+            "fastDelete": {
+              "description": "FastDelete skips waiting for namespace deletion.",
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "name": {
               "description": "Name defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in a the test spec.",
               "type": [
diff --git a/.schemas/json/test-chainsaw-v1alpha1.json b/.schemas/json/test-chainsaw-v1alpha1.json
@@ -1786,6 +1786,13 @@
             "null"
           ]
         },
+        "fastNamespaceDeletion": {
+          "description": "FastNamespaceDeletion skips waiting for namespace deletion.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "forceTerminationGracePeriod": {
           "description": "ForceTerminationGracePeriod forces the termination grace period on pods, statefulsets, daemonsets and deployments.",
           "type": [
diff --git a/pkg/apis/conversion/configuration.go b/pkg/apis/conversion/configuration.go
@@ -23,6 +23,7 @@ func Convert_v1alpha2_ConfigurationSpec_To_v1alpha1_ConfigurationSpec(in *v1alph
 	out.Namespace = in.Namespace.Name
 	out.NamespaceTemplate = in.Namespace.Template
 	out.NamespaceTemplateCompiler = in.Namespace.Compiler
+	out.FastNamespaceDeletion = in.Namespace.FastDelete
 	if in := in.Report; in != nil {
 		out.ReportFormat = v1alpha1.ReportFormatType(in.Format)
 		out.ReportPath = in.Path
@@ -59,9 +60,10 @@ func Convert_v1alpha1_ConfigurationSpec_To_v1alpha2_ConfigurationSpec(in *v1alph
 		ForceTerminationGracePeriod: in.ForceTerminationGracePeriod,
 	}
 	out.Namespace = v1alpha2.NamespaceOptions{
-		Name:     in.Namespace,
-		Compiler: in.NamespaceTemplateCompiler,
-		Template: in.NamespaceTemplate,
+		Name:       in.Namespace,
+		Compiler:   in.NamespaceTemplateCompiler,
+		Template:   in.NamespaceTemplate,
+		FastDelete: in.FastNamespaceDeletion,
 	}
 	out.Report = &v1alpha2.ReportOptions{
 		Format: v1alpha2.ReportFormatType(in.ReportFormat),
diff --git a/pkg/apis/v1alpha1/configuration.go b/pkg/apis/v1alpha1/configuration.go
@@ -75,7 +75,7 @@ type ConfigurationSpec struct {
 
 	// Namespace defines the namespace to use for tests.
 	// If not specified, every test will execute in a random ephemeral namespace
-	// unless the namespace is overridden in a the test spec.
+	// unless the namespace is overridden in the test spec.
 	// +optional
 	Namespace string `json:"namespace,omitempty"`
 
@@ -87,6 +87,10 @@ type ConfigurationSpec struct {
 	// +optional
 	NamespaceTemplate *Projection `json:"namespaceTemplate,omitempty"`
 
+	// FastNamespaceDeletion skips waiting for namespace deletion.
+	// +optional
+	FastNamespaceDeletion bool `json:"fastNamespaceDeletion,omitempty"`
+
 	// FullName makes use of the full test case folder path instead of the folder name.
 	// +optional
 	FullName bool `json:"fullName,omitempty"`
diff --git a/pkg/apis/v1alpha1/test.go b/pkg/apis/v1alpha1/test.go
@@ -76,6 +76,10 @@ type TestSpec struct {
 	// +optional
 	NamespaceTemplateCompiler *Compiler `json:"namespaceTemplateCompiler,omitempty"`
 
+	// FastNamespaceDeletion skips waiting for namespace deletion.
+	// +optional
+	FastNamespaceDeletion *bool `json:"fastNamespaceDeletion,omitempty"`
+
 	// Scenarios defines test scenarios.
 	// +optional
 	Scenarios []Scenario `json:"scenarios,omitempty"`
diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/v1alpha2/options.go b/pkg/apis/v1alpha2/options.go
@@ -93,6 +93,10 @@ type NamespaceOptions struct {
 	// Template defines a template to create the test namespace.
 	// +optional
 	Template *Projection `json:"template,omitempty"`
+
+	// FastDelete skips waiting for namespace deletion.
+	// +optional
+	FastDelete bool `json:"fastDelete,omitempty"`
 }
 
 type ReportFormatType string
diff --git a/pkg/commands/test/command.go b/pkg/commands/test/command.go
@@ -52,6 +52,7 @@ type options struct {
 	reportPath                  string
 	reportName                  string
 	namespace                   string
+	fastNamespaceDeletion       bool
 	deletionPropagationPolicy   string
 	fullName                    bool
 	excludeTestRegex            string
@@ -191,6 +192,9 @@ func Command() *cobra.Command {
 			if flagutils.IsSet(flags, "namespace") {
 				configuration.Spec.Namespace.Name = options.namespace
 			}
+			if flagutils.IsSet(flags, "fast-namespace-deletion") {
+				configuration.Spec.Namespace.FastDelete = options.fastNamespaceDeletion
+			}
 			if flagutils.IsSet(flags, "deletion-propagation-policy") {
 				configuration.Spec.Deletion.Propagation = metav1.DeletionPropagation(options.deletionPropagationPolicy)
 			}
@@ -257,6 +261,7 @@ func Command() *cobra.Command {
 				}
 			}
 			fprintfln(stdOut, "- Namespace '%v'", configuration.Spec.Namespace.Name)
+			fprintfln(stdOut, "- FastNamespaceDeletion %v", configuration.Spec.Namespace.FastDelete)
 			fprintfln(stdOut, "- FullName %v", configuration.Spec.Discovery.FullName)
 			fprintfln(stdOut, "- IncludeTestRegex '%v'", configuration.Spec.Discovery.IncludeTestRegex)
 			fprintfln(stdOut, "- ExcludeTestRegex '%v'", configuration.Spec.Discovery.ExcludeTestRegex)
@@ -434,6 +439,7 @@ func Command() *cobra.Command {
 	cmd.Flags().DurationVar(&options.forceTerminationGracePeriod.Duration, "force-termination-grace-period", 0, "If specified, overrides termination grace periods in applicable resources")
 	// namespace options
 	cmd.Flags().StringVar(&options.namespace, "namespace", "", "Namespace to use for tests")
+	cmd.Flags().BoolVar(&options.fastNamespaceDeletion, "fast-namespace-deletion", false, "Skips waiting for namespace deletion")
 	// templating options
 	cmd.Flags().BoolVar(&options.template, "template", config.Spec.Templating.Enabled, "If set, resources will be considered for templating")
 	cmd.Flags().StringVar(&options.defaultCompiler, "default-compiler", "", "If set, configures the default compiler (jp or cel)")
diff --git a/pkg/data/crds/chainsaw.kyverno.io_configurations.yaml b/pkg/data/crds/chainsaw.kyverno.io_configurations.yaml
@@ -874,6 +874,9 @@ spec:
                 description: FailFast determines whether the test should stop upon
                   encountering the first failure.
                 type: boolean
+              fastNamespaceDeletion:
+                description: FastNamespaceDeletion skips waiting for namespace deletion.
+                type: boolean
               forceTerminationGracePeriod:
                 description: ForceTerminationGracePeriod forces the termination grace
                   period on pods, statefulsets, daemonsets and deployments.
@@ -890,7 +893,7 @@ spec:
                 description: |-
                   Namespace defines the namespace to use for tests.
                   If not specified, every test will execute in a random ephemeral namespace
-                  unless the namespace is overridden in a the test spec.
+                  unless the namespace is overridden in the test spec.
                 type: string
               namespaceTemplate:
                 description: NamespaceTemplate defines a template to create the test
@@ -1912,6 +1915,9 @@ spec:
                     - jp
                     - cel
                     type: string
+                  fastDelete:
+                    description: FastDelete skips waiting for namespace deletion.
+                    type: boolean
                   name:
                     description: |-
                       Name defines the namespace to use for tests.
diff --git a/pkg/data/crds/chainsaw.kyverno.io_tests.yaml b/pkg/data/crds/chainsaw.kyverno.io_tests.yaml
@@ -905,6 +905,9 @@ spec:
                 description: FailFast determines whether the test should stop upon
                   encountering the first failure.
                 type: boolean
+              fastNamespaceDeletion:
+                description: FastNamespaceDeletion skips waiting for namespace deletion.
+                type: boolean
               forceTerminationGracePeriod:
                 description: ForceTerminationGracePeriod forces the termination grace
                   period on pods, statefulsets, daemonsets and deployments.
diff --git a/pkg/data/schemas/json/configuration-chainsaw-v1alpha1.json b/pkg/data/schemas/json/configuration-chainsaw-v1alpha1.json
@@ -1729,6 +1729,13 @@
             "null"
           ]
         },
+        "fastNamespaceDeletion": {
+          "description": "FastNamespaceDeletion skips waiting for namespace deletion.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "forceTerminationGracePeriod": {
           "description": "ForceTerminationGracePeriod forces the termination grace period on pods, statefulsets, daemonsets and deployments.",
           "type": [
@@ -1751,7 +1758,7 @@
           ]
         },
         "namespace": {
-          "description": "Namespace defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in a the test spec.",
+          "description": "Namespace defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in the test spec.",
           "type": [
             "string",
             "null"
diff --git a/pkg/data/schemas/json/configuration-chainsaw-v1alpha2.json b/pkg/data/schemas/json/configuration-chainsaw-v1alpha2.json
@@ -1846,6 +1846,13 @@
                 "cel"
               ]
             },
+            "fastDelete": {
+              "description": "FastDelete skips waiting for namespace deletion.",
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "name": {
               "description": "Name defines the namespace to use for tests.\nIf not specified, every test will execute in a random ephemeral namespace\nunless the namespace is overridden in a the test spec.",
               "type": [
diff --git a/pkg/data/schemas/json/test-chainsaw-v1alpha1.json b/pkg/data/schemas/json/test-chainsaw-v1alpha1.json
@@ -1786,6 +1786,13 @@
             "null"
           ]
         },
+        "fastNamespaceDeletion": {
+          "description": "FastNamespaceDeletion skips waiting for namespace deletion.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "forceTerminationGracePeriod": {
           "description": "ForceTerminationGracePeriod forces the termination grace period on pods, statefulsets, daemonsets and deployments.",
           "type": [
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -78,7 +78,7 @@ func (r *runner) run(ctx context.Context, m mainstart, nsOptions v1alpha2.Namesp
 				wg.Wait()
 			})
 			// setup cleanup
-			cleanup := cleaner.New(tc.Timeouts().Cleanup, false, nil, tc.DeletionPropagation())
+			cleanup := cleaner.New(tc.Timeouts().Cleanup, !nsOptions.FastDelete, nil, tc.DeletionPropagation())
 			t.Cleanup(func() {
 				fail(t, r.cleanup(ctx, tc, cleanup))
 				logging.Log(ctx, logging.Internal, logging.LogStatus, nil, color.BoldRed)
@@ -154,25 +154,29 @@ func (r *runner) run(ctx context.Context, m mainstart, nsOptions v1alpha2.Namesp
 							t.SkipNow()
 							return
 						}
-						// setup cleaner
-						cleanup := cleaner.New(tc.Timeouts().Cleanup, false, nil, tc.DeletionPropagation())
-						t.Cleanup(func() {
-							fail(t, r.testCleanup(ctx, tc, cleanup, report))
-						})
-						// setup namespace
+						// prepare namespace
 						// TODO: should be part of setupContext ?
 						if test.Test.Spec.Compiler != nil {
 							tc = tc.WithDefaultCompiler(string(*test.Test.Spec.Compiler))
 						}
 						nsOptions := nsOptions
 						nsOptions.Name = test.Test.Spec.Namespace
+						if test.Test.Spec.FastNamespaceDeletion != nil {
+							nsOptions.FastDelete = *test.Test.Spec.FastNamespaceDeletion
+						}
 						if tc.Namespacer() == nil && nsOptions.Name == "" {
 							nsOptions.Name = fmt.Sprintf("chainsaw-%s", petname.Generate(2, "-"))
 						}
 						if template := test.Test.Spec.NamespaceTemplate; template != nil && template.Value() != nil {
 							nsOptions.Template = template
 							nsOptions.Compiler = test.Test.Spec.NamespaceTemplateCompiler
 						}
+						// setup cleaner
+						cleanup := cleaner.New(tc.Timeouts().Cleanup, !nsOptions.FastDelete, nil, tc.DeletionPropagation())
+						t.Cleanup(func() {
+							fail(t, r.testCleanup(ctx, tc, cleanup, report))
+						})
+						// setup namespace
 						tc, err = r.setupNamespace(ctx, nsOptions, tc, cleanup)
 						if fail(t, err) {
 							return
diff --git a/testdata/commands/test/all_flags.txt b/testdata/commands/test/all_flags.txt
@@ -9,6 +9,7 @@ Loading default configuration...
 - ReportName 'foo'
 - ReportPath '../../../.temp'
 - Namespace 'bar'
+- FastNamespaceDeletion false
 - FullName true
 - IncludeTestRegex '^.*$'
 - ExcludeTestRegex '^.*$'
diff --git a/testdata/commands/test/config_all_fields.txt b/testdata/commands/test/config_all_fields.txt
@@ -9,6 +9,7 @@ Loading config (../../../testdata/commands/test/config/config_all_fields.yaml)..
 - ReportName 'custom-chainsaw-report'
 - ReportPath '../../../.temp'
 - Namespace 'test-namespace'
+- FastNamespaceDeletion false
 - FullName true
 - IncludeTestRegex '^include-.*'
 - ExcludeTestRegex '^exclude-.*'
diff --git a/testdata/commands/test/default.txt b/testdata/commands/test/default.txt
@@ -6,6 +6,7 @@ Loading default configuration...
 - SkipDelete false
 - FailFast false
 - Namespace ''
+- FastNamespaceDeletion false
 - FullName false
 - IncludeTestRegex ''
 - ExcludeTestRegex ''
diff --git a/testdata/commands/test/help.txt b/testdata/commands/test/help.txt
@@ -17,6 +17,7 @@ Flags:
       --exclude-test-regex string                 Regular expression to exclude tests
       --exec-timeout duration                     The exec timeout to use as default for configuration (default 5s)
       --fail-fast                                 Stop the test upon encountering the first failure
+      --fast-namespace-deletion                   Skips waiting for namespace deletion
       --force-termination-grace-period duration   If specified, overrides termination grace periods in applicable resources
       --full-name                                 Use full test case folder path instead of folder name
   -h, --help                                      help for test
diff --git a/testdata/commands/test/with_regex.txt b/testdata/commands/test/with_regex.txt
@@ -6,6 +6,7 @@ Loading default configuration...
 - SkipDelete false
 - FailFast false
 - Namespace ''
+- FastNamespaceDeletion false
 - FullName false
 - IncludeTestRegex 'test[4-6]'
 - ExcludeTestRegex 'test[1-3]'
diff --git a/testdata/commands/test/with_repeat_count.txt b/testdata/commands/test/with_repeat_count.txt
@@ -6,6 +6,7 @@ Loading default configuration...
 - SkipDelete false
 - FailFast false
 - Namespace ''
+- FastNamespaceDeletion false
 - FullName false
 - IncludeTestRegex ''
 - ExcludeTestRegex ''
diff --git a/testdata/commands/test/with_suppress.txt b/testdata/commands/test/with_suppress.txt
@@ -9,6 +9,7 @@ Loading default configuration...
 - ReportFormat ''
 - ReportName ''
 - Namespace ''
+- FastNamespaceDeletion false
 - FullName false
 - IncludeTestRegex ''
 - ExcludeTestRegex ''
diff --git a/testdata/commands/test/with_test_dirs.txt b/testdata/commands/test/with_test_dirs.txt
@@ -6,6 +6,7 @@ Loading default configuration...
 - SkipDelete false
 - FailFast false
 - Namespace ''
+- FastNamespaceDeletion false
 - FullName false
 - IncludeTestRegex ''
 - ExcludeTestRegex ''
diff --git a/testdata/commands/test/with_timeout.txt b/testdata/commands/test/with_timeout.txt
diff --git a/testdata/e2e/examples/negative-testing/resource/chainsaw-test.yaml b/testdata/e2e/examples/negative-testing/resource/chainsaw-test.yaml
diff --git a/website/docs/reference/apis/chainsaw.v1alpha1.md b/website/docs/reference/apis/chainsaw.v1alpha1.md
diff --git a/website/docs/reference/apis/chainsaw.v1alpha2.md b/website/docs/reference/apis/chainsaw.v1alpha2.md
diff --git a/website/docs/reference/commands/chainsaw_test.md b/website/docs/reference/commands/chainsaw_test.md
