Merge branch 'okdmain-fix' into 'main'

Fix integ test on OKD

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

Author: rjeberhard

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

@@ -334,9 +334,14 @@ void testCreateMiiDomainWithClusterFromOnPremDomain() {
       hostName = createRouteForOKD(clusterService, domainNamespace);
     }
 
-    final String ingressServiceName = traefikHelmParams.getReleaseName();
-    String hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
-        ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) : getHostAndPort(hostName, traefikNodePort);
+    String hostAndPort = null;
+    if (!OKD) {
+      final String ingressServiceName = traefikHelmParams.getReleaseName();
+      hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
+          ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) : getHostAndPort(hostName, traefikNodePort);
+    } else {
+      hostAndPort = getHostAndPort(hostName, traefikNodePort);
+    }
     logger.info("hostAndPort = {0} ", hostAndPort);
 
     String curlString = String.format("curl -v --show-error --noproxy '*' "

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

@@ -318,13 +318,18 @@ private boolean coherenceCacheTest(String hostName) {
 
   private boolean coherenceCacheTest(String hostName, int ingressServiceNodePort) {
     logger.info("Starting to test the cache");
-    // get ingress service Name and Nodeport
-    String ingressServiceName = traefikHelmParams.getReleaseName();
-    String traefikNamespace = traefikHelmParams.getNamespace();
 
-    String hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
-        ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace)
-            : getHostAndPort(hostName, ingressServiceNodePort);;
+    String hostAndPort = null;
+    if (!OKD) {
+      // get ingress service Name and Nodeport
+      String ingressServiceName = traefikHelmParams.getReleaseName();
+      String traefikNamespace = traefikHelmParams.getNamespace();
+      hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
+          ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace)
+          : getHostAndPort(hostName, ingressServiceNodePort);
+    } else {
+      hostAndPort = getHostAndPort(hostName, ingressServiceNodePort);
+    }
     logger.info("hostAndPort is: {0} ", hostAndPort);
 
     // add the data to cache

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

@@ -221,10 +221,15 @@ void testWlsRemoteConsoleConnectionUsingSSL() {
     int sslPort = getServicePort(
          domainNamespace, getExternalServicePodName(adminServerPodName), "default-secure");
     setTargetPortForRoute("domain1-admin-server-sslport-ext", domainNamespace, sslPort);
-    String ingressServiceName = traefikHelmParams.getReleaseName();
-    String hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
-        ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace)
-            : getHostAndPort(adminSvcSslPortExtHost, sslNodePort);
+    String hostAndPort = null;
+    if (!OKD) {
+      String ingressServiceName = traefikHelmParams.getReleaseName();
+      hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
+          ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace)
+          : getHostAndPort(adminSvcSslPortExtHost, sslNodePort);
+    } else {
+      hostAndPort = getHostAndPort(adminSvcSslPortExtHost, sslNodePort);
+    }
 
     logger.info("The hostAndPort is {0}", hostAndPort);
 

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

@@ -457,12 +457,18 @@ private static String buildCurlCommand(String hostName,
 
     if (clusterAddress.length == 0) {
       //use a LBer ingress controller to build the curl command to run on local
-      final String ingressServiceName = traefikHelmParams.getReleaseName();
+      String hostAndPort = null;
       final String httpHeaderFile = LOGS_DIR + "/headers";
       logger.info("Build a curl command with hostname {0} and port {1}", hostName, servicePort);
 
-      String hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
-          ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) : getHostAndPort(hostName, servicePort);
+      if (!OKD) {
+        final String ingressServiceName = traefikHelmParams.getReleaseName();
+        hostAndPort = getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) != null
+            ? getServiceExtIPAddrtOke(ingressServiceName, traefikNamespace) : getHostAndPort(hostName, servicePort);
+      } else {
+        hostAndPort = getHostAndPort(hostName, servicePort);
+      }
+
 
       curlCmd.append(" --noproxy '*' -H 'host: ")
           .append(hostName)