Merge branch 'podman-conversion-02072024' into 'main'

conversion of tests to podman

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

Author: jshum2479

Jenkinsfile.podman

@@ -69,6 +69,7 @@ pipeline {
         choice(name: 'MAVEN_PROFILE_NAME',
                 description: 'Profile to use in mvn command to run the tests. Possible values are wls-srg (the default), integration-tests, toolkits-srg, kind-sequential and kind-upgrade. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
                 choices: [
+		        'kind-parallel',
                         'wls-srg',
                         'integration-tests',
                         'kind-sequential',
@@ -398,8 +399,12 @@ nodes:
         hostPort: 2480
       - containerPort: 32490
         hostPort: 2490
+      - containerPort: 32156
+        hostPort: 2156
       - containerPort: 30511
         hostPort: 1511
+      - containerPort: 32159
+        hostPort: 2160
     extraMounts:
       - hostPath: ${pv_root}
         containerPath: ${pv_root}

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

@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -15,22 +16,26 @@
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
+import oracle.weblogic.kubernetes.utils.OracleHttpClient;
 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_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
+import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
+import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.getNextIntrospectVersion;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
 import static oracle.weblogic.kubernetes.actions.impl.Domain.patchDomainCustomResource;
-import static oracle.weblogic.kubernetes.assertions.TestAssertions.adminNodePortAccessible;
+import static oracle.weblogic.kubernetes.utils.ApplicationUtils.verifyAdminServerRESTAccess;
+import static oracle.weblogic.kubernetes.utils.ApplicationUtils.verifyAdminServerRESTAccessInAdminPod;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.isAppInServerPodReady;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainOnPvUsingWdt;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
@@ -56,14 +61,17 @@ class ItAddNewDynamicClusterUsingWlst {
 
   // domain constants
   private static final String domainUid = "dynasconfigcluster-domain-1";
-  private static final String adminServerPodName = domainUid + "-admin-server";
+  private static final String adminServerName = "admin-server";
+  private static final String adminServerPodName = domainUid + "-" + adminServerName;
+  private static final int adminPort = 7001;
   private static final String newManagedServerPrefix = "new-managed-server";
   private static final String newManagedServerPodPrefix = domainUid + "-" + newManagedServerPrefix;
   private static final String clusterName = "cluster-1";
   private static final String newClusterName = "cluster-2";
   private static final int replicaCount = 2;
   private static final String wlSecretName = "weblogic-credentials";
   private static String domainNamespace = null;
+  private static String hostHeader;
 
   private static LoggingFacade logger = null;
 
@@ -104,6 +112,13 @@ void testDynamicClusterNotAsConfigCluster() {
     DomainResource domain = createDomainOnPvUsingWdt(domainUid, domainNamespace, wlSecretName,
         clusterName, replicaCount, ItAddNewDynamicClusterUsingWlst.class.getSimpleName());
     assertDomainNotNull(domain);
+    
+    if (TestConstants.KIND_CLUSTER
+        && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
+      hostHeader = createIngressHostRouting(domainNamespace, domainUid, adminServerName, adminPort);
+      assertDoesNotThrow(() -> verifyAdminServerRESTAccess("localhost", 
+          TRAEFIK_INGRESS_HTTP_HOSTPORT, false, hostHeader));
+    }    
 
     // get admin service node port
     logger.info("Getting node port for default channel");
@@ -116,15 +131,16 @@ void testDynamicClusterNotAsConfigCluster() {
 
     logger.info("Validating WebLogic admin server access by login to console");
     if (OKE_CLUSTER) {
-      testUntil(isAppInServerPodReady(domainNamespace,
-          adminServerPodName, 7001, "/console/login/LoginForm.jsp", "Copyright"),
-          logger, "Validating WebLogic admin server access by login to console");
-    } else {
-      testUntil(
-          assertDoesNotThrow(() -> {
-            return adminNodePortAccessible(serviceNodePort,
-                ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, routeHost);
-          }, "Access to admin server node port failed"), logger, "Console login validation");
+      testUntil(() -> verifyAdminServerRESTAccessInAdminPod(adminServerPodName, "7001",
+          domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
+          logger, "Validating WebLogic admin server access using REST api");
+    } else if (OKD) {
+      testUntil(() -> {
+        String url = "http://" + routeHost + ":" + serviceNodePort + "/management/tenant-monitoring/servers/";
+        HttpResponse<String> response;
+        response = OracleHttpClient.get(url, null, true);
+        return response.body().contains("RUNNING");
+      }, logger, "Access to admin server failed");
     }
 
     // create a new dynamic cluster using an online WLST script
@@ -143,7 +159,7 @@ private void createNewDynamicCluster() {
     // get port for default channel
     logger.info("Getting port for default channel");
     int defaultChannelPort = assertDoesNotThrow(()
-        -> getServicePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"),
+        -> getServicePort(domainNamespace, adminServerPodName, "default"),
         "Getting admin server default port failed");
     assertNotEquals(-1, defaultChannelPort, "Couldn't get valid port for default channel");
     logger.info("default channel port: {0}", defaultChannelPort);

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

@@ -1001,11 +1001,7 @@ private void createDomain() {
                 .addEnvItem(new V1EnvVar()
                     .name("JAVA_OPTIONS")
                     .value("-Dweblogic.debug.DebugSituationalConfig=true "
-                        + "-Dweblogic.debug.DebugSituationalConfigDumpXml=true "
-                        + "-Dweblogic.kernel.debug=true "
-                        + "-Dweblogic.debug.DebugMessaging=true "
-                        + "-Dweblogic.debug.DebugConnection=true "
-                        + "-Dweblogic.ResolveDNSName=true"))
+                        + "-Dweblogic.debug.DebugSituationalConfigDumpXml=true "))
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
                     .value("-Djava.security.egd=file:/dev/./urandom "))
@@ -1020,7 +1016,7 @@ private void createDomain() {
                 .adminService(new AdminService()
                     .addChannelsItem(new Channel()
                         .channelName("default")
-                        .nodePort(getNextFreePort())))));
+                        .nodePort(0)))));
     setPodAntiAffinity(domain);
 
     // create cluster object

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

@@ -1,8 +1,10 @@
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
 
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 import io.kubernetes.client.openapi.models.V1EnvVar;
@@ -29,6 +31,8 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
+import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATED_MODE_CONAINERPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATED_MODE_HOSTPORT;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
 import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
@@ -38,10 +42,11 @@
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WLS_DOMAIN_TYPE;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.ITTESTS_DIR;
-import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
+import static oracle.weblogic.kubernetes.actions.TestActions.getPodCreationTimestamp;
+import static oracle.weblogic.kubernetes.actions.impl.Domain.scaleClusterWithRestApi;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.scaleAndVerifyCluster;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyClusterAfterScaling;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.setTlsTerminationForRoute;
@@ -81,6 +86,7 @@ class ItDedicatedMode {
        domainUid + "-" + ADMIN_SERVER_NAME_BASE;
   private final String managedServerPodPrefix =
        domainUid + "-" + MANAGED_SERVER_NAME_BASE;
+  private static int externalRestHttpsPort = IT_DEDICATED_MODE_CONAINERPORT;
 
   // operator constants
   private static HelmParams opHelmParams;
@@ -138,7 +144,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     // domainNamespaces parameter to something other than Operator ns (say wls)
     logger.info("Installing and verifying operator");
     installAndVerifyOperator(opNamespace, opNamespace + "-sa",
-        true, 0, opHelmParams, domainNamespaceSelectionStrategy,
+        true, externalRestHttpsPort, opHelmParams, domainNamespaceSelectionStrategy,
         false, domain2Namespace);
     logger.info("Operator installed on namespace {0} and domainNamespaces set to {1} ", opNamespace, domain2Namespace);
 
@@ -180,16 +186,33 @@ void testDedicatedModeSameNamespace() {
     verifyDomainRunning(domain1Namespace);
     logger.info("WebLogic domain is managed in operator namespace Only");
 
+    List<OffsetDateTime> listOfPodCreationTimestamp = new ArrayList<>();
+    for (int i = 1; i <= replicaCount; i++) {
+      String managedServerPodName = managedServerPodPrefix + i;
+      OffsetDateTime originalCreationTimestamp
+          = assertDoesNotThrow(() -> getPodCreationTimestamp(domain1Namespace, "", managedServerPodName),
+              String.format("getPodCreationTimestamp failed with ApiException for pod %s in namespace %s",
+                  managedServerPodName, domain1Namespace));
+      listOfPodCreationTimestamp.add(originalCreationTimestamp);
+    }  
     // Scale up cluster-1 in domain1Namespace and verify it succeeds
-    int externalRestHttpsPort = getServiceNodePort(opNamespace, "external-weblogic-operator-svc");
-    logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);
+    String externalRestHttpshost;
+    if (TestConstants.KIND_CLUSTER
+        && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
+      externalRestHttpshost = "localhost";
+      externalRestHttpsPort = IT_DEDICATED_MODE_HOSTPORT;
+      logger.info("Running in podman using Operator hostport {0}:{1}", externalRestHttpshost, externalRestHttpsPort);
+    } else {
+      logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);
+      externalRestHttpshost = null;
+    }
 
     logger.info("scaling the cluster from {0} servers to {1} servers", replicaCount, replicaCount + 1);
-    scaleAndVerifyCluster(clusterName, domainUid, domain1Namespace,
-        managedServerPodPrefix, replicaCount, replicaCount + 1,
-        true, externalRestHttpsPort, opNamespace, opNamespace + "-sa",
-        false, "", "", 0, "",
-        "", null, null);
+    scaleClusterWithRestApi(domainUid, clusterName, replicaCount + 1,
+        externalRestHttpshost, externalRestHttpsPort, opNamespace, opServiceAccount);
+
+    verifyClusterAfterScaling(domainUid, domain1Namespace, managedServerPodPrefix,
+        replicaCount, replicaCount + 1, null, null, listOfPodCreationTimestamp);
   }
 
   private void createDomain(String domainNamespace) {

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

@@ -42,6 +42,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
+import static oracle.weblogic.kubernetes.TestConstants.ITEXTERNALNODEPORTSERVICE_CONAINERPORT;
 import static oracle.weblogic.kubernetes.TestConstants.ITEXTERNALNODEPORTSERVICE_HOSTPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOSTNAME;
@@ -153,15 +154,14 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
             "weblogicenc", "weblogicenc");
 
     // Prepare the config map sparse model file from the template by replacing
-    // Public Address of the custom channel with K8S_NODEPORT_HOST
+    // Public Address of the custom channel with K8S_NODEPORT_HOST    
     Map<String, String> configTemplateMap = new HashMap<>();
+    configTemplateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      configTemplateMap.put("INGRESS_HOST", "localhost");
-      configTemplateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_HOSTPORT));
+      configTemplateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
     } else {
-      nextFreePort = getNextFreePort();
-      configTemplateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
+      nextFreePort = getNextFreePort();      
       configTemplateMap.put("FREE_PORT", String.valueOf(nextFreePort));
     }
 
@@ -230,8 +230,7 @@ void testExternalRmiAccessThruNodePortService() {
     templateMap.put("CLUSTER", clusterName);
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      templateMap.put("INGRESS_HOST", "localhost");
-      templateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_HOSTPORT));
+      templateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
     } else {
       templateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
       templateMap.put("FREE_PORT", String.valueOf(nextFreePort));
@@ -263,7 +262,13 @@ void testExternalRmiAccessThruNodePortService() {
 
     // This test uses JMSclient which gets an InitialContext. For this, we need to specify the http port that
     // the client can access to get the Initial context.
-    String hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", httpTunnelingPort);
+    String hostAndPort;
+    if (TestConstants.KIND_CLUSTER
+        && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
+      hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", ITEXTERNALNODEPORTSERVICE_HOSTPORT);
+    } else {
+      hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", httpTunnelingPort);
+    }
 
     // Make sure the JMS Connection LoadBalancing and message LoadBalancing
     // works from RMI client outside of k8s cluster