Delete the cluster at correct index to prevent intermittent test failures (#4055)

* Delete the cluster at correct index to prevent intermittent test failures

Author: sankarpn

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java

@@ -78,6 +78,8 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
+import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
+import static oracle.weblogic.kubernetes.utils.DomainUtils.removeClusterInDomainResource;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.verifyDomainStatusConditionTypeDoesNotExist;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -292,15 +294,16 @@ void testDomainK8sEventsNonExistingManagedServer() {
   @Test
   @DisplayName("Test domain Failed event for non-existing cluster")
   void testDomainK8sEventsNonExistingCluster() {
+    String nonExistingClusterName = "nonexisting-cluster";
     OffsetDateTime timestamp = now();
     createClusterAndVerify(createClusterResource(
-        "nonexisting-cluster", "nonexisting-cluster", domainNamespace3, replicaCount));
+        nonExistingClusterName, nonExistingClusterName, domainNamespace3, replicaCount));
     logger.info("patch the domain resource with new cluster");
     try {
       String patchStr
           = "["
           + "{\"op\": \"add\",\"path\": \"/spec/clusters/-\", \"value\": "
-          + "    {\"name\" : \"nonexisting-cluster\"}"
+          + "    {\"name\" : \"" + nonExistingClusterName + "\"}"
           + "}]";
       logger.info("Updating domain configuration using patch string: {0}\n", patchStr);
       V1Patch patch = new V1Patch(patchStr);
@@ -311,12 +314,7 @@ void testDomainK8sEventsNonExistingCluster() {
     } finally {
       //remove the cluster from domain resource
       timestamp = now();
-      String patchStr = "[{\"op\": \"remove\",\"path\": \"/spec/clusters/1\"}]";
-      logger.info("Updating domain configuration using patch string: {0}\n", patchStr);
-      V1Patch patch = new V1Patch(patchStr);
-      assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
-          "Failed to patch domain");
-
+      assertDoesNotThrow(() -> removeClusterInDomainResource(nonExistingClusterName, domainUid, domainNamespace3));
       // verify the Changed event is generated
       checkEvent(opNamespace, domainNamespace3, domainUid, DOMAIN_CHANGED, "Normal", timestamp);
     }
@@ -478,7 +476,7 @@ void testScaleDomainAndVerifyCompletedEvent() {
     createDomain(domainNamespace4, domainUid, pvName4, pvcName4);
     scaleDomainAndVerifyCompletedEvent(1, ScaleAction.scaleDown, true, domainNamespace4);
     scaleDomainAndVerifyCompletedEvent(2, ScaleAction.scaleUp, true, domainNamespace4);
-    shutdownDomain(domainUid, domainNamespace4);
+    deleteDomainResource(domainNamespace4, domainUid);
   }
 
   /**
@@ -991,4 +989,5 @@ private void scaleDomainAndVerifyCompletedEvent(int replicaCount, ScaleAction te
           opNamespace, namespace, domainUid, DOMAIN_COMPLETED, "Normal", timestamp, countBefore);
     }
   }
+  
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java

@@ -16,11 +16,13 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
 
 import io.kubernetes.client.custom.V1Patch;
+import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapVolumeSource;
 import io.kubernetes.client.openapi.models.V1Container;
@@ -428,6 +430,45 @@ public static void deleteDomainResource(String domainNS, String domainUid) {
         domainNS);
   }
 
+  /**
+   * Remove cluster reference from domain resource.
+   *
+   * @param clusterName name of the cluster to be removed from domain resource
+   * @param domainUid name of the domain resource
+   * @param namespace namespace in which domain resource exists
+   * @throws ApiException throws when cluster interaction fails
+   */
+  public static void removeClusterInDomainResource(String clusterName, String domainUid, String namespace)
+      throws ApiException {
+    LoggingFacade logger = getLogger();
+    logger.info("Removing the cluster {0} from domain resource {1}", clusterName, domainUid);
+    DomainResource domainCustomResource = getDomainCustomResource(domainUid, namespace);
+    Optional<V1LocalObjectReference> cluster = domainCustomResource.getSpec()
+        .getClusters().stream().filter(o -> o.getName().equals(clusterName)).findAny();
+    int clusterIndex = -1;
+    if (cluster.isPresent()) {
+      clusterIndex = domainCustomResource.getSpec().getClusters().indexOf(cluster.get());
+      logger.info("Cluster index is {0}", clusterIndex);
+    } else {
+      logger.warning("Cluster {0} not found in domain resource {1} in namespace {2}", 
+          clusterName, domainUid, namespace);
+    }
+    if (clusterIndex != -1) {
+      String patchStr = "[{\"op\": \"remove\",\"path\": \"/spec/clusters/" + clusterIndex + "\"}]";
+      logger.info("Updating domain configuration using patch string: {0}\n", patchStr);
+      V1Patch patch = new V1Patch(patchStr);
+      assertTrue(patchDomainCustomResource(domainUid, namespace, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
+          "Failed to patch domain");
+      Callable<Boolean> clusterNotFound = () -> !getDomainCustomResource(domainUid, namespace).getSpec()
+          .getClusters().stream().anyMatch(c -> c.getName().equals(clusterName));
+      testUntil(clusterNotFound, logger, "cluster {0} to be removed from domain resource in namespace {1}",
+          clusterName, namespace);
+    } else {
+      logger.warning("Cluster {0} not found in domain resource {1} in namespace {2}", 
+          clusterName, domainUid, namespace);
+    }
+  }
+  
   /**
    * Patch a domain with auxiliary image and verify pods are rolling restarted.
    * @param oldImageName old auxiliary image name