fix integration test to run on OKD (#2316)

* fix integration test to run on OKD

* update liftandshift test

Co-authored-by: Oracle Public Cloud User <opc@brokd-667035.sub07210031390.markvcn.oraclevcn.com>
Co-authored-by: Oracle Public Cloud User <opc@api.c1.okd4.weblogick8s.org>
Co-authored-by: Oracle Public Cloud User <opc@api-int.c1.okd4.weblogick8s.org>

Author: 4 people

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

@@ -34,6 +34,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -67,13 +68,14 @@
 // which load and verify the cache.
 @DisplayName("Test to create a WebLogic domain with Coherence and verify the use of Coherence cache service")
 @IntegrationTest
+@Tag("okdenv")
 class ItCoherenceTests {
 
   // constants for Coherence
   private static final String PROXY_CLIENT_APP_NAME = "coherence-proxy-client";
   private static final String PROXY_SERVER_APP_NAME = "coherence-proxy-server";
   private static final String APP_LOC_ON_HOST = APP_DIR + "/" + PROXY_CLIENT_APP_NAME;
-  private static final String APP_LOC_IN_POD = "/u01/oracle/apps/" + PROXY_CLIENT_APP_NAME;
+  private static final String APP_LOC_IN_POD = "/u01/apps/" + PROXY_CLIENT_APP_NAME;
   private static final String PROXY_CLIENT_SCRIPT = "buildRunProxyClient.sh";
   private static final String OP_CACHE_LOAD = "load";
   private static final String OP_CACHE_VALIDATE = "validate";
@@ -143,7 +145,7 @@ void tearDown() {
    */
   @Test
   @DisplayName("Create domain with a Coherence cluster using WDT and test rolling restart")
-  public void testCohernceServerRollingRestart() {
+  public void testCoherenceServerRollingRestart() {
     final String successMarker = "CACHE-SUCCESS";
 
     // create a DomainHomeInImage image using WebLogic Image Tool

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

@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
@@ -62,6 +63,7 @@
  */
 @DisplayName("Test server's pod init container feature")
 @IntegrationTest
+@Tag("okdenv")
 class ItInitContainers {
 
   private static String opNamespace = null;

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

@@ -78,6 +78,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
+import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -114,6 +115,7 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressForDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createPV;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createPVC;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
@@ -146,6 +148,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Verify the introspectVersion runs the introspector")
 @IntegrationTest
+@Tag("okdenv")
 public class ItIntrospectVersion {
 
   private static String opNamespace = null;
@@ -161,6 +164,9 @@ public class ItIntrospectVersion {
       : WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG;
   private final String wlSecretName = "weblogic-credentials";
 
+  private static String adminSvcExtHost = null;
+  private static String clusterRouteHost = null;
+
   private Map<String, OffsetDateTime> podsWithTimeStamps = null;
 
   private static final String INTROSPECT_DOMAIN_SCRIPT = "introspectDomain.sh";
@@ -204,8 +210,9 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     nodeportshttp = getNextFreePort();
     int nodeportshttps = getNextFreePort();
 
-    // install and verify NGINX
-    nginxHelmParams = installAndVerifyNginx(nginxNamespace, nodeportshttp, nodeportshttps);
+    if (!OKD) {
+      nginxHelmParams = installAndVerifyNginx(nginxNamespace, nodeportshttp, nodeportshttps);
+    }
 
     // create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
     // this secret is used only for non-kind cluster
@@ -240,6 +247,7 @@ public void testDomainIntrospectVersionNotRolling() {
 
     final String adminServerName = "admin-server";
     final String adminServerPodName = domainUid + "-" + adminServerName;
+    final String clusterServiceName = domainUid + "-cluster-" + clusterName;
 
     final String managedServerNameBase = "managed-server";
     String managedServerPodNamePrefix = domainUid + "-" + managedServerNameBase;
@@ -374,6 +382,11 @@ public void testDomainIntrospectVersionNotRolling() {
       checkPodReady(managedServerPodNamePrefix + i, domainUid, introDomainNamespace);
     }
 
+    if (OKD) {
+      adminSvcExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName), introDomainNamespace);
+      logger.info("admin svc host = {0}", adminSvcExtHost);
+    }
+
     // deploy application and verify all servers functions normally
     logger.info("Getting port for default channel");
     int defaultChannelPort = assertDoesNotThrow(()
@@ -391,15 +404,23 @@ public void testDomainIntrospectVersionNotRolling() {
     //deploy clusterview application
     logger.info("Deploying clusterview app {0} to cluster {1}",
         clusterViewAppPath, clusterName);
-    ExecResult result = null;
+    //ExecResult result = null;
     String targets = "{identity:[clusters,'mycluster']},{identity:[servers,'admin-server']}";
-    result = deployUsingRest(K8S_NODEPORT_HOST,
-        Integer.toString(serviceNodePort),
-        ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT,
-        targets, clusterViewAppPath, null, "clusterview");
-    assertNotNull(result, "Application deployment failed");
-    logger.info("Application deployment returned {0}", result.toString());
-    assertEquals("202", result.stdout(), "Application deploymen failed with wrong HTTP status code");
+
+    String hostAndPort = (OKD) ? adminSvcExtHost : K8S_NODEPORT_HOST + ":" + serviceNodePort;
+    logger.info("hostAndPort = {0} ", hostAndPort);
+
+    withStandardRetryPolicy.conditionEvaluationListener(
+        condition -> logger.info("Deploying the application using Rest"
+            + "(elapsed time {0} ms, remaining time {1} ms)",
+            condition.getElapsedTimeInMS(),
+            condition.getRemainingTimeInMS()))
+        .until((Callable<Boolean>) () -> {
+          ExecResult result = assertDoesNotThrow(() -> deployUsingRest(hostAndPort, 
+                       ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT,
+                       targets, clusterViewAppPath, null, "clusterview"));
+          return result.stdout().equals("202");
+        });
 
     List<String> managedServerNames = new ArrayList<String>();
     for (int i = 1; i <= replicaCount; i++) {
@@ -498,10 +519,14 @@ public void conditionEvaluated(EvaluatedCondition condition) {
     }
 
     //create ingress controller
-    Map<String, Integer> clusterNameMsPortMap = new HashMap<>();
-    clusterNameMsPortMap.put(clusterName, managedServerPort);
-    logger.info("Creating ingress for domain {0} in namespace {1}", domainUid, introDomainNamespace);
-    createIngressForDomainAndVerify(domainUid, introDomainNamespace, clusterNameMsPortMap);
+    if (!OKD) {
+      Map<String, Integer> clusterNameMsPortMap = new HashMap<>();
+      clusterNameMsPortMap.put(clusterName, managedServerPort);
+      logger.info("Creating ingress for domain {0} in namespace {1}", domainUid, introDomainNamespace);
+      createIngressForDomainAndVerify(domainUid, introDomainNamespace, clusterNameMsPortMap);
+    } else {
+      clusterRouteHost = createRouteForOKD(clusterServiceName, introDomainNamespace);
+    }
 
     managedServerNames = new ArrayList<String>();
     for (int i = 1; i <= replicaCount + 1; i++) {
@@ -511,13 +536,24 @@ public void conditionEvaluated(EvaluatedCondition condition) {
     //verify admin server accessibility and the health of cluster members
     verifyMemberHealth(adminServerPodName, managedServerNames, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
 
-    //access application in managed servers through NGINX load balancer
-    logger.info("Accessing the clusterview app through NGINX load balancer");
-    String curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-            + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
+    String curlRequest = null;
+
+    if (OKD) {
+      logger.info("cluster svc host = {0}", clusterRouteHost);
+      logger.info("Accessing the clusterview app through cluster route");
+      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
+            + "http://%s/clusterview/ClusterViewServlet"
             + "\"?user=" + ADMIN_USERNAME_DEFAULT
-            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
-        domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
+            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"", clusterRouteHost);
+    } else {
+      //access application in managed servers through NGINX load balancer
+      logger.info("Accessing the clusterview app through NGINX load balancer");
+      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
+                   + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
+                   + "\"?user=" + ADMIN_USERNAME_DEFAULT
+                   + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
+               domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
+    }
 
     // verify each managed server can see other member in the cluster
     verifyServerCommunication(curlRequest, managedServerNames);
@@ -662,13 +698,23 @@ public void testDomainIntrospectVersionRolling() {
     //verify admin server accessibility and the health of cluster members
     verifyMemberHealth(adminServerPodName, managedServerNames, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
 
-    //access application in managed servers through NGINX load balancer
-    logger.info("Accessing the clusterview app through NGINX load balancer");
-    String curlRequest = String.format("curl --silent --show-error --noproxy '*' "
-            + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
+    String curlRequest = null;
+    if (OKD) {
+      logger.info("cluster svc host = {0}", clusterRouteHost);
+      logger.info("Accessing the clusterview app through cluster route");
+      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
+            + "http://%s/clusterview/ClusterViewServlet"
             + "\"?user=" + ADMIN_USERNAME_DEFAULT
-            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
-        domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
+            + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"", clusterRouteHost);
+    } else {
+      //access application in managed servers through NGINX load balancer
+      logger.info("Accessing the clusterview app through NGINX load balancer");
+      curlRequest = String.format("curl --silent --show-error --noproxy '*' "
+                   + "-H 'host: %s' http://%s:%s/clusterview/ClusterViewServlet"
+                   + "\"?user=" + ADMIN_USERNAME_DEFAULT
+                   + "&password=" + ADMIN_PASSWORD_DEFAULT + "\"",
+               domainUid + "." + introDomainNamespace + "." + clusterName + ".test", K8S_NODEPORT_HOST, nodeportshttp);
+    }
 
     // verify each managed server can see other member in the cluster
     verifyServerCommunication(curlRequest, managedServerNames);
@@ -810,9 +856,9 @@ introDomainNamespace, getExternalServicePodName(adminServerPodName), "default"),
     final boolean VALID = true;
     final boolean INVALID = false;
     logger.info("Check that after patching current credentials are not valid and new credentials are");
-    verifyCredentials(adminServerPodName, introDomainNamespace,
+    verifyCredentials(adminSvcExtHost, adminServerPodName, introDomainNamespace,
          ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, INVALID);
-    verifyCredentials(adminServerPodName, introDomainNamespace,
+    verifyCredentials(adminSvcExtHost, adminServerPodName, introDomainNamespace,
          ADMIN_USERNAME_PATCH, ADMIN_PASSWORD_PATCH, VALID);
 
     List<String> managedServerNames = new ArrayList<String>();
@@ -1150,8 +1196,11 @@ private static void verifyMemberHealth(String adminServerPodName, List<String> m
         -> getServiceNodePort(introDomainNamespace, getExternalServicePodName(adminServerPodName), "default"),
         "Getting admin server node port failed");
 
+    String hostAndPort = (OKD) ? adminSvcExtHost : K8S_NODEPORT_HOST + ":" + serviceNodePort;
+    logger.info("hostAndPort = {0} ", hostAndPort);
+
     logger.info("Checking the health of servers in cluster");
-    String url = "http://" + K8S_NODEPORT_HOST + ":" + serviceNodePort
+    String url = "http://" + hostAndPort
         + "/clusterview/ClusterViewServlet?user=" + user + "&password=" + password;
 
     withStandardRetryPolicy.conditionEvaluationListener(

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

@@ -29,6 +29,7 @@
 import org.awaitility.core.ConditionFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -37,6 +38,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
+import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
@@ -53,6 +55,7 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createImageAndVerify;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyTraefik;
@@ -82,6 +85,7 @@
 
 @DisplayName("Test to validate on-prem to k8s use case")
 @IntegrationTest
+@Tag("okdenv")
 public class ItLiftAndShiftFromOnPremDomain {
   private static String opNamespace = null;
   private static String traefikNamespace = null;
@@ -106,6 +110,8 @@ public class ItLiftAndShiftFromOnPremDomain {
   private Path zipFile;
 
   private static HelmParams traefikHelmParams = null;
+  private int traefikNodePort = 0;
+  private String hostName = null;
 
   /**
    * Install Operator.
@@ -142,9 +148,11 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     // install and verify operator
     installAndVerifyOperator(opNamespace, domainNamespace);
 
-    // install and verify Traefik
-    logger.info("Installing Traefik controller using helm");
-    traefikHelmParams = installAndVerifyTraefik(traefikNamespace, 0, 0);
+    if (!OKD) {
+      // install and verify Traefik
+      logger.info("Installing Traefik controller using helm");
+      traefikHelmParams = installAndVerifyTraefik(traefikNamespace, 0, 0);
+    }
 
   }
 
@@ -160,6 +168,7 @@ public void testCreateMiiDomainWithClusterFromOnPremDomain() {
     // admin/managed server name here should match with model yaml in MII_BASIC_WDT_MODEL_FILE
     final String adminServerPodName = domainUid + "-admin-server";
     final String managedServerPrefix = domainUid + "-managed-server";
+    final String clusterService = domainUid + "-cluster-cluster-1";
     final int replicaCount = 5;
 
     assertDoesNotThrow(() -> {
@@ -311,18 +320,24 @@ public void testCreateMiiDomainWithClusterFromOnPremDomain() {
       checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
     }
 
-    // create ingress rules with path routing for Traefik
-    createTraefikIngressRoutingRules(domainNamespace);
+    if (!OKD) {
+      // create ingress rules with path routing for Traefik
+      createTraefikIngressRoutingRules(domainNamespace);
+    
+      traefikNodePort = getServiceNodePort(traefikNamespace, traefikHelmParams.getReleaseName(), "web");
+      assertTrue(traefikNodePort != -1,
+          "Could not get the default external service node port");
+      logger.info("Found the Traefik service nodePort {0}", traefikNodePort);
+      logger.info("The K8S_NODEPORT_HOST is {0}", K8S_NODEPORT_HOST);
+    } else {
+      hostName = createRouteForOKD(clusterService, domainNamespace);
+    }
 
-    int traefikNodePort = getServiceNodePort(traefikNamespace, traefikHelmParams.getReleaseName(), "web");
-    assertTrue(traefikNodePort != -1,
-        "Could not get the default external service node port");
-    logger.info("Found the Traefik service nodePort {0}", traefikNodePort);
-    logger.info("The K8S_NODEPORT_HOST is {0}", K8S_NODEPORT_HOST);
+    String hostAndPort = (OKD) ? hostName : K8S_NODEPORT_HOST + ":" + traefikNodePort;
+    logger.info("hostAndPort = {0} ", hostAndPort);
 
     String curlString = String.format("curl -v --show-error --noproxy '*' "
-            + "http://%s:%s/opdemo/?dsName=testDatasource",
-        K8S_NODEPORT_HOST, traefikNodePort);
+            + "http://%s/opdemo/?dsName=testDatasource", hostAndPort);
 
     // check and wait for the application to be accessible in admin pod
     checkAppIsRunning(

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

@@ -14,7 +14,6 @@
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1LocalObjectReference;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import io.kubernetes.client.openapi.models.V1PodSecurityContext;
 import io.kubernetes.client.openapi.models.V1ResourceRequirements;
 import io.kubernetes.client.openapi.models.V1SecretReference;
 import oracle.weblogic.domain.AdminServer;
@@ -32,6 +31,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
@@ -71,6 +71,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Verify liveness probe customization")
 @IntegrationTest
+@Tag("okdenv")
 public class ItLivenessProbeCustomization {
 
   private static String domainNamespace = null;
@@ -297,9 +298,7 @@ private static void createAndVerifyMiiDomain(String miiImage) {
                     .value("/u01/customLivenessProbe.sh"))
                 .resources(new V1ResourceRequirements()
                     .limits(new HashMap<>())
-                    .requests(new HashMap<>()))
-                .podSecurityContext(new V1PodSecurityContext()
-                    .runAsUser(0L)))
+                    .requests(new HashMap<>())))
             .adminServer(new AdminServer()
                 .serverStartState("RUNNING"))
             .clusters(clusterList)