Owls 103231 - Changes to retry the failed patch operation in ItKubernetesDomainEvents tests and explicitly get the v8 version of domain (#3510)

* changes to retry the domain custom resource patch operation in ItKubernetesDomainEvents tests.

* Changes to explicitly get the v8 version of domain to support the interop (hybrid) environment.

Author: ankedia

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

@@ -460,7 +460,7 @@ void testDomainK8sEventsScaleBelowMin() {
           + "]";
       logger.info("Updating replicas in cluster {0} using patch string: {1}", cluster1Name, patchStr);
       V1Patch patch = new V1Patch(patchStr);
-      assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
+      assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH, 5),
           "Failed to patch domain");
 
       // No event will be created for this
@@ -476,7 +476,7 @@ void testDomainK8sEventsScaleBelowMin() {
           + "]";
       logger.info("Updating replicas in cluster {0} using patch string: {1}", cluster1Name, patchStr);
       V1Patch patch = new V1Patch(patchStr);
-      assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
+      assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH, 5),
           "Failed to patch domain");
     }
   }

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java

@@ -192,7 +192,23 @@ public static oracle.weblogic.domain.Domain getDomainCustomResource(String domai
    */
   public static boolean patchDomainCustomResource(String domainUid, String namespace, V1Patch patch,
                                                   String patchFormat) {
-    return Kubernetes.patchDomainCustomResource(domainUid, namespace, patch, patchFormat);
+    return Kubernetes.patchDomainCustomResource(domainUid, namespace, patch, patchFormat, 0);
+  }
+
+  /**
+   * Patch the Domain Custom Resource.
+   *
+   * @param domainUid unique domain identifier
+   * @param namespace name of namespace
+   * @param patch patch data in format matching the specified media type
+   * @param patchFormat one of the following types used to identify patch document:
+   *     "application/json-patch+json", "application/merge-patch+json",
+   * @param maxRetryCount Max retry count.
+   * @return true if successful, false otherwise
+   */
+  public static boolean patchDomainCustomResource(String domainUid, String namespace, V1Patch patch,
+                                                  String patchFormat, int maxRetryCount) {
+    return Kubernetes.patchDomainCustomResource(domainUid, namespace, patch, patchFormat, maxRetryCount);
   }
 
   /**

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java

@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -91,6 +93,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.awaitility.Awaitility.with;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -290,7 +293,6 @@ private static void initializeGenericKubernetesApiClients() {
         );
     deleteOptions = new DeleteOptions();
     deleteOptions.setGracePeriodSeconds(0L);
-    deleteOptions.setPropagationPolicy(FOREGROUND);
   }
 
   // ------------------------  deployments -----------------------------------
@@ -1358,23 +1360,37 @@ public static boolean patchCustomResourceDomainJsonMergePatch(String domainUid,
    */
   public static boolean patchDomainCustomResource(String domainUid, String namespace,
                                                   V1Patch patch, String patchFormat) {
+    return patchDomainCustomResource(domainUid, namespace, patch, patchFormat, 0);
+  }
 
-    // GenericKubernetesApi uses CustomObjectsApi calls
-    KubernetesApiResponse<Domain> response = crdClient.patch(
-        namespace, // name of namespace
-        domainUid, // name of custom resource domain
-        patchFormat, // "application/json-patch+json" or "application/merge-patch+json"
-        patch // patch data
-    );
-
-    if (!response.isSuccess()) {
-      getLogger().warning(
-          "Failed to patch " + domainUid + " in namespace " + namespace + " using patch format: "
-              + patchFormat);
-      return false;
-    }
+  /**
+   * Patch the Domain Custom Resource.
+   *
+   * @param domainUid unique domain identifier
+   * @param namespace name of namespace
+   * @param patch patch data in format matching the specified media type
+   * @param patchFormat one of the following types used to identify patch document:
+   *     "application/json-patch+json", "application/merge-patch+json",
+   * @param maxRetryCount Max retry count.
+   * @return true if successful, false otherwise
+   */
+  public static boolean patchDomainCustomResource(String domainUid, String namespace,
+                                                  V1Patch patch, String patchFormat, int maxRetryCount) {
+
+    final AtomicBoolean result = new AtomicBoolean(false);
+    final AtomicInteger retryCount = new AtomicInteger(0);
+    testUntil(() -> {
+      KubernetesApiResponse<Domain> response = crdClient.patch(
+          namespace, // name of namespace
+          domainUid, // name of custom resource domain
+          patchFormat, // "application/json-patch+json" or "application/merge-patch+json"
+          patch // patch data
+      );
+      result.set(response.isSuccess());
+      return response.isSuccess() || retryCount.incrementAndGet() > maxRetryCount;
+    }, getLogger(), "Retrying the domain resource patch operation until successful.");
 
-    return true;
+    return result.get();
   }
 
   /**
@@ -2954,4 +2970,4 @@ public InputStream getInputStream() {
       return new ByteArrayInputStream(copy.toByteArray());
     }
   }
-}
+}

kubernetes/samples/scripts/create-weblogic-domain/model-in-image/utils/wl-pod-wait.sh

@@ -179,7 +179,7 @@ function getDomainValue() {
   local ljpath="{$1}"
   local __retvar=$2
   set +e
-  attvalue=$(kubectl -n ${DOMAIN_NAMESPACE} get domain ${DOMAIN_UID} -o=jsonpath="$ljpath" 2>&1)
+  attvalue=$(kubectl -n ${DOMAIN_NAMESPACE} get domain.v8.weblogic.oracle ${DOMAIN_UID} -o=jsonpath="$ljpath" 2>&1)
   if [ $? -ne 0 ]; then
     if [ $expected -ne 0 ]; then
       echo "@@ Error: Could not obtain '$1' from '${DOMAIN_UID}' in namespace '${DOMAIN_NAMESPACE}'. Is your domain resource deployed? Err='$attvalue'"
@@ -202,7 +202,7 @@ function getDomainAIImages() {
   set +e
   attvalue=$(
     kubectl \
-      get domain ${DOMAIN_UID} \
+      get domain.v8.weblogic.oracle ${DOMAIN_UID} \
       -n ${DOMAIN_NAMESPACE} \
       -o=jsonpath="{range .spec.serverPod.auxiliaryImages[*]}{.image}{','}{end}" \
       2>&1