Merge branch 'main' into release/4.0

Author: rjeberhard

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

@@ -103,7 +103,6 @@
 import static oracle.weblogic.kubernetes.utils.UpgradeUtils.installOldOperator;
 import static oracle.weblogic.kubernetes.utils.UpgradeUtils.upgradeOperatorToCurrent;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -335,12 +334,6 @@ void upgradeWlsAuxDomain(String oldVersion) {
 
   // After upgrade scale up/down the cluster
   private void scaleClusterUpAndDown() {
-    String opServiceAccount = opNamespace + "-sa";
-    int externalRestHttpsPort = getServiceNodePort(
-        opNamespace, "external-weblogic-operator-svc");
-    assertNotEquals(-1, externalRestHttpsPort,
-        "Could not get the Operator external service node port");
-    logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);
 
     String clusterName = domainUid + "-" + "cluster-1";
     logger.info("Updating the cluster {0} replica count to 3", clusterName);
@@ -354,7 +347,6 @@ private void scaleClusterUpAndDown() {
     assertTrue(p1Success,
         String.format("Patching replica to 2 failed for cluster %s in namespace %s",
             clusterName, domainNamespace));
-
   }
 
   private void installDomainResource(

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

@@ -73,7 +73,6 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteConfigMap;
 import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getJob;
-import static oracle.weblogic.kubernetes.actions.TestActions.getPod;
 import static oracle.weblogic.kubernetes.actions.TestActions.getPodCreationTimestamp;
 import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -97,12 +96,12 @@
 import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
 import static oracle.weblogic.kubernetes.utils.IstioUtils.createIstioDomainResource;
 import static oracle.weblogic.kubernetes.utils.JobUtils.createJobAndWaitUntilComplete;
-import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
 import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainWithNewSecretAndVerify;
 import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createfixPVCOwnerContainer;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
 import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
+import static oracle.weblogic.kubernetes.utils.PodUtils.getIntrospectorPodName;
 import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime;
 import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
 import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -1239,20 +1238,15 @@ public static void verifyIntrospectorRuns(String domainUid, String domainNamespa
     //verify the introspector pod is created and runs
     LoggingFacade logger = getLogger();
     logger.info("Verifying introspector pod is created, runs and deleted");
-    String introspectJobName = getIntrospectJobName(domainUid);
-    checkPodReady(introspectJobName, domainUid, domainNamespace);
-
-    String labelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
-    V1Pod introspectorPod = assertDoesNotThrow(() -> getPod(domainNamespace, labelSelector, introspectJobName),
-        "Could not get introspector pod");
-    assertTrue(introspectorPod != null && introspectorPod.getMetadata() != null,
-        "introspector pod or metadata is null");
-    String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPod.getMetadata().getName(),
-        domainNamespace), "Could not get introspector pod log");
+    String introspectorPodName = assertDoesNotThrow(() -> getIntrospectorPodName(domainUid, domainNamespace));
+    checkPodReady(introspectorPodName, domainUid, domainNamespace);
+
     logger.info("Introspector pod log START");
+    String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPodName,
+        domainNamespace, null, null, null, true), "Could not get introspector pod log");
     logger.info(introspectorLog);
     logger.info("Introspector pod log END");
-    checkPodDoesNotExist(introspectJobName, domainUid, domainNamespace);
+    checkPodDoesNotExist(introspectorPodName, domainUid, domainNamespace);
   }
 
   /**