feat: allow to skip namespace deletion in junit extension (#3178)

Author: csviri

operator-framework-junit/src/main/java/io/javaoperatorsdk/operator/junit/AbstractOperatorExtension.java

@@ -58,6 +58,7 @@ public abstract class AbstractOperatorExtension
   protected Duration infrastructureTimeout;
   protected final boolean oneNamespacePerClass;
   protected final boolean preserveNamespaceOnError;
+  protected final boolean skipNamespaceDeletion;
   protected final boolean waitForNamespaceDeletion;
   protected final int namespaceDeleteTimeout = DEFAULT_NAMESPACE_DELETE_TIMEOUT;
   protected final Function<ExtensionContext, String> namespaceNameSupplier;
@@ -70,6 +71,7 @@ protected AbstractOperatorExtension(
       Duration infrastructureTimeout,
       boolean oneNamespacePerClass,
       boolean preserveNamespaceOnError,
+      boolean skipNamespaceDeletion,
       boolean waitForNamespaceDeletion,
       KubernetesClient kubernetesClient,
       KubernetesClient infrastructureKubernetesClient,
@@ -85,6 +87,7 @@ protected AbstractOperatorExtension(
     this.infrastructureTimeout = infrastructureTimeout;
     this.oneNamespacePerClass = oneNamespacePerClass;
     this.preserveNamespaceOnError = preserveNamespaceOnError;
+    this.skipNamespaceDeletion = skipNamespaceDeletion;
     this.waitForNamespaceDeletion = waitForNamespaceDeletion;
     this.namespaceNameSupplier = namespaceNameSupplier;
     this.perClassNamespaceNameSupplier = perClassNamespaceNameSupplier;
@@ -202,19 +205,22 @@ protected void after(ExtensionContext context) {
       if (preserveNamespaceOnError && context.getExecutionException().isPresent()) {
         LOGGER.info("Preserving namespace {}", namespace);
       } else {
+        LOGGER.info("Deleting infrastructure resources and operator in namespace {}", namespace);
         infrastructureKubernetesClient.resourceList(infrastructure).delete();
         deleteOperator();
-        LOGGER.info("Deleting namespace {} and stopping operator", namespace);
-        infrastructureKubernetesClient.namespaces().withName(namespace).delete();
-        if (waitForNamespaceDeletion) {
-          LOGGER.info("Waiting for namespace {} to be deleted", namespace);
-          Awaitility.await("namespace deleted")
-              .pollInterval(50, TimeUnit.MILLISECONDS)
-              .atMost(namespaceDeleteTimeout, TimeUnit.SECONDS)
-              .until(
-                  () ->
-                      infrastructureKubernetesClient.namespaces().withName(namespace).get()
-                          == null);
+        if (!skipNamespaceDeletion) {
+          LOGGER.info("Deleting namespace {}", namespace);
+          infrastructureKubernetesClient.namespaces().withName(namespace).delete();
+          if (waitForNamespaceDeletion) {
+            LOGGER.info("Waiting for namespace {} to be deleted", namespace);
+            Awaitility.await("namespace deleted")
+                .pollInterval(50, TimeUnit.MILLISECONDS)
+                .atMost(namespaceDeleteTimeout, TimeUnit.SECONDS)
+                .until(
+                    () ->
+                        infrastructureKubernetesClient.namespaces().withName(namespace).get()
+                            == null);
+          }
         }
       }
     }
@@ -229,6 +235,7 @@ public abstract static class AbstractBuilder<T extends AbstractBuilder<T>> {
     protected final List<HasMetadata> infrastructure;
     protected Duration infrastructureTimeout;
     protected boolean preserveNamespaceOnError;
+    protected boolean skipNamespaceDeletion;
     protected boolean waitForNamespaceDeletion;
     protected boolean oneNamespacePerClass;
     protected int namespaceDeleteTimeout;
@@ -245,6 +252,9 @@ protected AbstractBuilder() {
       this.preserveNamespaceOnError =
           Utils.getSystemPropertyOrEnvVar("josdk.it.preserveNamespaceOnError", false);
 
+      this.skipNamespaceDeletion =
+          Utils.getSystemPropertyOrEnvVar("josdk.it.skipNamespaceDeletion", false);
+
       this.waitForNamespaceDeletion =
           Utils.getSystemPropertyOrEnvVar("josdk.it.waitForNamespaceDeletion", true);
 
@@ -261,6 +271,11 @@ public T preserveNamespaceOnError(boolean value) {
       return (T) this;
     }
 
+    public T skipNamespaceDeletion(boolean value) {
+      this.skipNamespaceDeletion = value;
+      return (T) this;
+    }
+
     public T waitForNamespaceDeletion(boolean value) {
       this.waitForNamespaceDeletion = value;
       return (T) this;

operator-framework-junit/src/main/java/io/javaoperatorsdk/operator/junit/ClusterDeployedOperatorExtension.java

@@ -51,6 +51,7 @@ private ClusterDeployedOperatorExtension(
       List<HasMetadata> infrastructure,
       Duration infrastructureTimeout,
       boolean preserveNamespaceOnError,
+      boolean skipNamespaceDeletion,
       boolean waitForNamespaceDeletion,
       boolean oneNamespacePerClass,
       KubernetesClient kubernetesClient,
@@ -62,6 +63,7 @@ private ClusterDeployedOperatorExtension(
         infrastructureTimeout,
         oneNamespacePerClass,
         preserveNamespaceOnError,
+        skipNamespaceDeletion,
         waitForNamespaceDeletion,
         kubernetesClient,
         infrastructureKubernetesClient,
@@ -189,6 +191,7 @@ public ClusterDeployedOperatorExtension build() {
           infrastructure,
           infrastructureTimeout,
           preserveNamespaceOnError,
+          skipNamespaceDeletion,
           waitForNamespaceDeletion,
           oneNamespacePerClass,
           kubernetesClient,

operator-framework-junit/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -80,6 +80,7 @@ private LocallyRunOperatorExtension(
       List<CustomResourceDefinition> additionalCustomResourceDefinitionInstances,
       Duration infrastructureTimeout,
       boolean preserveNamespaceOnError,
+      boolean skipNamespaceDeletion,
       boolean waitForNamespaceDeletion,
       boolean oneNamespacePerClass,
       KubernetesClient kubernetesClient,
@@ -94,6 +95,7 @@ private LocallyRunOperatorExtension(
         infrastructureTimeout,
         oneNamespacePerClass,
         preserveNamespaceOnError,
+        skipNamespaceDeletion,
         waitForNamespaceDeletion,
         kubernetesClient,
         infrastructureKubernetesClient,
@@ -541,6 +543,7 @@ public LocallyRunOperatorExtension build() {
           additionalCustomResourceDefinitionInstances,
           infrastructureTimeout,
           preserveNamespaceOnError,
+          skipNamespaceDeletion,
           waitForNamespaceDeletion,
           oneNamespacePerClass,
           kubernetesClient,