Cleanup artifacts in Kubernetes cluster (#1603)

* Adding cleanup methods to cleanup all the Kubernetyes artifacts left
behind by the test class.

* Leave the cluster artifacts untouched

* correct the typo

* cleanup javadoc

* add logs for pods

* Addressing review comments

* Refactor the methods

* javadoc fix

* Fix javadoc

Author: sankarpn

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

@@ -72,14 +72,11 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.defaultWitParams;
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteNamespace;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteServiceAccount;
 import static oracle.weblogic.kubernetes.actions.TestActions.dockerLogin;
 import static oracle.weblogic.kubernetes.actions.TestActions.dockerPush;
 import static oracle.weblogic.kubernetes.actions.TestActions.execCommand;
 import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorImageName;
 import static oracle.weblogic.kubernetes.actions.TestActions.installOperator;
-import static oracle.weblogic.kubernetes.actions.TestActions.uninstallOperator;
 import static oracle.weblogic.kubernetes.actions.TestActions.upgradeOperator;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.doesImageExist;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
@@ -508,7 +505,10 @@ public void testCreateMiiDomainSameDomainUidDiffNS() {
   }
 
 
-  private void tearDown() {
+  // This method is needed in this test class, since the cleanup util
+  // won't cleanup the images.
+  @AfterAll
+  void tearDown() {
 
     // Delete domain custom resource
     logger.info("Delete domain custom resource in namespace {0}", domainNamespace);
@@ -533,51 +533,6 @@ private void tearDown() {
 
   }
 
-  /**
-   * Uninstall Operator, delete service account, domain namespace and
-   * operator namespace.
-   */
-  @AfterAll
-  public void tearDownAll() {
-    tearDown();
-    // uninstall operator release
-    logger.info("Uninstall Operator in namespace {0}", opNamespace);
-    if (opHelmParams != null) {
-      uninstallOperator(opHelmParams);
-    }
-    // Delete service account from unique opNamespace
-    logger.info("Delete service account in namespace {0}", opNamespace);
-    if (serviceAccount != null) {
-      assertDoesNotThrow(() -> deleteServiceAccount(serviceAccount.getMetadata().getName(),
-              serviceAccount.getMetadata().getNamespace()),
-              "deleteServiceAccount failed with ApiException");
-    }
-    // Delete domain namespaces
-    logger.info("Deleting domain namespace {0}", domainNamespace);
-    if (domainNamespace != null) {
-      assertDoesNotThrow(() -> deleteNamespace(domainNamespace),
-          "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + domainNamespace);
-    }
-
-    // Delete domain namespaces
-    logger.info("Deleting domain namespace {0}", domainNamespace1);
-    if (domainNamespace1 != null) {
-      assertDoesNotThrow(() -> deleteNamespace(domainNamespace1),
-              "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + domainNamespace1);
-    }
-
-    // Delete opNamespace
-    logger.info("Deleting Operator namespace {0}", opNamespace);
-    if (opNamespace != null) {
-      assertDoesNotThrow(() -> deleteNamespace(opNamespace),
-          "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + opNamespace);
-    }
-
-  }
-
   private String createImageAndVerify() {
     // create unique image name with date
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleDomainValidation.java

@@ -23,18 +23,13 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.annotations.tags.Slow;
 import oracle.weblogic.kubernetes.extensions.LoggedTest;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteDomainCustomResource;
-import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolume;
-import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolumeClaim;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteServiceAccount;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
 import static org.awaitility.Awaitility.with;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -165,35 +160,4 @@ public void testCreatingDomain() {
         .until(domainExists(domainUid, "v7", namespace));
   }
 
-  /**
-   * Delete artifacts.
-   */
-  @AfterAll
-  public void cleanup() {
-
-    // Delete domain custom resource
-    assertTrue(deleteDomainCustomResource(domainUid, namespace), "Domain failed to be deleted, "
-        + "look at the above console log messages for failure reason in ApiException responsebody");
-    logger.info("Deleted Domain Custom Resource {0} from {1}", domainUid, namespace);
-
-    // Delete service account from unique namespace
-    assertTrue(deleteServiceAccount(serviceAccount.getMetadata().getName(),
-        serviceAccount.getMetadata().getNamespace()), "Service account failed to be deleted, "
-        + "look at the above console log messages for failure reason in ApiException responsebody");
-    logger.info("Deleted service account \'" + serviceAccount.getMetadata().getName()
-        + "\' in namespace: " + serviceAccount.getMetadata().getNamespace());
-
-    // Delete the persistent volume claim and persistent volume
-    assertTrue(deletePersistentVolumeClaim(pvcName, namespace),
-        "Persistent volume claim deletion failed, "
-        + "look at the above console log messages for failure reason in ApiException responsebody");
-
-    assertTrue(deletePersistentVolume(pvName), "Persistent volume deletion failed, "
-        + "look at the above console log messages for failure reason in ApiException responsebody");
-
-    // Delete namespace
-    assertTrue(TestActions.deleteNamespace(namespace), "Namespace failed to be deleted, "
-        + "look at the above console log messages for failure reason in ApiException responsebody");
-    logger.info("Deleted namespace: {0}", namespace);
-  }
 }

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleOperatorValidation.java

@@ -19,7 +19,6 @@
 import oracle.weblogic.kubernetes.annotations.tags.MustNotRunInParallel;
 import oracle.weblogic.kubernetes.annotations.tags.Slow;
 import oracle.weblogic.kubernetes.extensions.LoggedTest;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -38,11 +37,8 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.createDockerConfigJson;
 import static oracle.weblogic.kubernetes.actions.TestActions.createSecret;
 import static oracle.weblogic.kubernetes.actions.TestActions.createServiceAccount;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteNamespace;
-import static oracle.weblogic.kubernetes.actions.TestActions.deleteServiceAccount;
 import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorImageName;
 import static oracle.weblogic.kubernetes.actions.TestActions.installOperator;
-import static oracle.weblogic.kubernetes.actions.TestActions.uninstallOperator;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isHelmReleaseDeployed;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.operatorIsRunning;
 import static org.awaitility.Awaitility.with;
@@ -162,43 +158,4 @@ public void testInstallingOperator(@Namespaces(3) List<String> namespaces) {
 
   }
 
-  @AfterEach
-  public void tearDown() {
-    // To Do: Remove this after we have common cleanup
-    // uninstall operator release
-    logger.info("Uninstall Operator in namespace {0}", opNamespace);
-    if (opHelmParams != null) {
-      uninstallOperator(opHelmParams);
-    }
-    // Delete service account from unique opNamespace
-    logger.info("Delete service account in namespace {0}", opNamespace);
-    if (serviceAccount != null) {
-      assertDoesNotThrow(() -> deleteServiceAccount(serviceAccount.getMetadata().getName(),
-          serviceAccount.getMetadata().getNamespace()),
-          "deleteServiceAccount failed with ApiException");
-    }
-    // Delete domain namespaces
-    logger.info("Deleting domain namespace {0}", domainNamespace1);
-    if (domainNamespace1 != null) {
-      assertDoesNotThrow(() -> deleteNamespace(domainNamespace1),
-          "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + domainNamespace1);
-    }
-
-    logger.info("Deleting domain namespace {0}", domainNamespace2);
-    if (domainNamespace2 != null) {
-      assertDoesNotThrow(() -> deleteNamespace(domainNamespace2),
-          "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + domainNamespace2);
-    }
-
-    // Delete opNamespace
-    logger.info("Deleting Operator namespace {0}", opNamespace);
-    if (opNamespace != null) {
-      assertDoesNotThrow(() -> deleteNamespace(opNamespace),
-          "deleteNamespace failed with ApiException");
-      logger.info("Deleted namespace: " + opNamespace);
-    }
-  }
-
 }