Merge branch 'oketest42lb' into 'release/4.2'

Added support to check health status and cleanup for istio created load balancers

See merge request weblogic-cloud/weblogic-kubernetes-operator!4816

Author: rjeberhard

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

@@ -9,6 +9,7 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
+import oracle.weblogic.kubernetes.extensions.InitializationTasks;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -24,6 +25,7 @@
 import static oracle.weblogic.kubernetes.utils.ApplicationUtils.callWebAppAndCheckForServerNameInResponse;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
+import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.deleteLoadBalancer;
 import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.getLoadBalancerIP;
 import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyOCILoadBalancer;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
@@ -41,7 +43,7 @@
     + "all managed servers in the domain through OCI Load Balancer")
 @IntegrationTest
 @Tag("oke-arm")
-@Tag("oke-parallel")
+@Tag("oke-gate")
 class ItOCILoadBalancer {
   // domain constants
   private static final int replicaCount = 2;
@@ -84,6 +86,7 @@ public void tearDownAll() {
     if (!SKIP_CLEANUP) {
       Kubernetes.deleteService(OCI_LB_NAME, domainNamespace);
     }
+    deleteLoadBalancer(loadBalancerIP);
   }
 
   /**
@@ -114,9 +117,10 @@ void testOCILoadBalancer() throws Exception {
     assertDoesNotThrow(() -> installAndVerifyOCILoadBalancer(domainNamespace,
         clusterHttpPort, clusterName, domainUid, OCI_LB_NAME),
         "Installation of OCI Load Balancer failed");
-    loadBalancerIP = getLoadBalancerIP(domainNamespace,OCI_LB_NAME);
+    loadBalancerIP = getLoadBalancerIP(domainNamespace,OCI_LB_NAME, true);
     assertNotNull(loadBalancerIP, "External IP for Load Balancer is undefined");
     logger.info("LoadBalancer IP is " + loadBalancerIP);
+    InitializationTasks.registerLoadBalancerExternalIP(loadBalancerIP);
     verifyWebAppAccessThroughOCILoadBalancer(loadBalancerIP, 2, clusterHttpPort);
   }
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java

@@ -11,9 +11,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -134,7 +136,7 @@ public class InitializationTasks implements BeforeAllCallback, ExtensionContext.
   private static String wdtBasicImage;
 
   private static Collection<String> pushedImages = new ArrayList<>();
-  private static Collection<String> lbIPs = new ArrayList<>();
+  private static Set<String> lbIPs = new HashSet<>();
   private static boolean isInitializationSuccessful = false;
 
   ConditionFactory withVeryLongRetryPolicy

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

@@ -24,6 +24,7 @@
 import oracle.weblogic.domain.OnlineUpdate;
 import oracle.weblogic.domain.ServerPod;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
+import oracle.weblogic.kubernetes.extensions.InitializationTasks;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.SemanticVersion.Compatibility;
 
@@ -37,6 +38,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.ISTIO_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
 import static oracle.weblogic.kubernetes.TestConstants.OCNE;
+import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
 import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_TAG;
@@ -51,9 +53,12 @@
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.formatIPv6Host;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getServiceExtIPAddrtOke;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
 import static oracle.weblogic.kubernetes.utils.FileUtils.generateFileFromTemplate;
 import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
+import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.isLoadBalancerHealthy;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
 import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
@@ -113,6 +118,16 @@ public static void installIstio() {
             .command(command)
             .redirect(false))
         .execute());
+    if (OKE_CLUSTER) {
+      String loadBalancerIP = getServiceExtIPAddrtOke("istio-ingressgateway", "istio-system");
+      testUntil(
+          assertDoesNotThrow(() -> isLoadBalancerHealthy("istio-system", "istio-ingressgateway"),
+              "isLoadBalancerHealthy failed with ApiException"),
+          logger,
+          "Istio LoadBalancer to be healthy in namespace {0}",
+          "istio-system");
+      InitializationTasks.registerLoadBalancerExternalIP(loadBalancerIP);
+    }
   }
 
   /**

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

@@ -350,9 +350,23 @@ public static Callable<Boolean> isLoadBalancerHealthy(String namespace, String n
    * @param lbName -loadbalancer service name
    */
   public static String getLoadBalancerIP(String namespace, String lbName) throws Exception {
-    Map<String, String> labels = new HashMap<>();
-    labels.put("loadbalancer", lbName);
-    V1Service service = getService(lbName, null, namespace);
+    return getLoadBalancerIP(namespace, lbName, false);
+  }
+
+  /**
+   * Retreive external IP from OCI LoadBalancer.
+   *
+   * @param namespace - namespace
+   * @param lbName -loadbalancer service name
+   * @param addLabel search service with label
+   */
+  public static String getLoadBalancerIP(String namespace, String lbName, boolean addLabel) throws Exception {
+    Map<String, String> labels = null;
+    if (addLabel) {
+      labels = new HashMap<>();
+      labels.put("loadbalancer", lbName);
+    }
+    V1Service service = getService(lbName, labels, namespace);
     assertNotNull(service, "Can't find service with name " + lbName);
     LoggingFacade logger = getLogger();
     logger.info("Found service with name {0} in {1} namespace ", lbName, namespace);
@@ -864,7 +878,7 @@ public static String getLbExternalIp(String lbrelname, String lbns) throws Excep
    * @param lbPublicIP public Load Balancer IP
    */
   public static void deleteLoadBalancer(String lbPublicIP) {
-    if (!lbPublicIP.isEmpty()) {
+    if (lbPublicIP != null && !lbPublicIP.isEmpty()) {
       if (lbPublicIP.startsWith("[") && lbPublicIP.endsWith("]")) {
         // Remove the brackets and return the content inside
         lbPublicIP = lbPublicIP.substring(1, lbPublicIP.length() - 1);