Merge branch 'nightly-042924-42' into 'release/4.2'

Fix for nightly failures in release 4.2

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

Author: jshum2479

Jenkinsfile.podman

@@ -390,66 +390,86 @@ nodes:
   - role: worker
     image: ${kind_image}
     extraPortMappings:
-      - containerPort: 30880
-        hostPort: 2080
-        protocol: TCP
-      - containerPort: 30443
-        hostPort: 2443
-        protocol: TCP
-      - containerPort: 31880
-        hostPort: 2180
-        protocol: TCP
-      - containerPort: 31443
-        hostPort: 2543
-      - containerPort: 30881
-        hostPort: 2081
-        protocol: TCP
-      - containerPort: 30444
-        hostPort: 2444
-        protocol: TCP
+      - containerPort: 30511
+        hostPort: 1511    
       - containerPort: 32480
         hostPort: 2480
       - containerPort: 32490
-        hostPort: 2490
-      - containerPort: 32156
+        hostPort: 2490    
+      - containerPort: 30080
+        hostPort: 2080
+      - containerPort: 30443
+        hostPort: 2043
+      - containerPort: 30180
+        hostPort: 2090
+      - containerPort: 30143
+        hostPort: 2053
+      - containerPort: 31000
+        hostPort: 2100
+      - containerPort: 31004
+        hostPort: 2104
+      - containerPort: 31008
+        hostPort: 2108
+      - containerPort: 31012
+        hostPort: 2112
+      - containerPort: 31016
+        hostPort: 2116
+      - containerPort: 31020
+        hostPort: 2120
+      - containerPort: 31024
+        hostPort: 2124
+      - containerPort: 31028
+        hostPort: 2128
+      - containerPort: 31032
+        hostPort: 2132
+      - containerPort: 31036
+        hostPort: 2136
+      - containerPort: 31040
+        hostPort: 2140
+      - containerPort: 31044
+        hostPort: 2144
+      - containerPort: 31048
+        hostPort: 2148
+      - containerPort: 31052
+        hostPort: 2152
+      - containerPort: 31056
         hostPort: 2156
-      - containerPort: 30511
-        hostPort: 1511
-      - containerPort: 32159
+      - containerPort: 31060
         hostPort: 2160
-      - containerPort: 32169
+      - containerPort: 31064
+        hostPort: 2164
+      - containerPort: 31068
+        hostPort: 2168
+      - containerPort: 31072
         hostPort: 2172
-        protocol: TCP
-      - containerPort: 32170
-        hostPort: 2173
-        protocol: TCP
-      - containerPort: 32189
-        hostPort: 2182
-        protocol: TCP
-      - containerPort: 32185
-        hostPort: 2175
-        protocol: TCP
-      - containerPort: 32143
-        hostPort: 2143
-        protocol: TCP
-      - containerPort: 32343
-        hostPort: 2343
-        protocol: TCP
-      - containerPort: 32331
-        hostPort: 2331
-        protocol: TCP
-      - containerPort: 31781
-        hostPort: 2781
-        protocol: TCP
-      - containerPort: 31744
-        hostPort: 2782
-        protocol: TCP	
-      - containerPort: 31785
-        hostPort: 2785
-        protocol: TCP
-      - containerPort: 31746
-        hostPort: 2786
-        protocol: TCP	
+      - containerPort: 31076
+        hostPort: 2176
+      - containerPort: 31080
+        hostPort: 2180
+      - containerPort: 31084
+        hostPort: 2184
+      - containerPort: 31088
+        hostPort: 2188
+      - containerPort: 31092
+        hostPort: 2192
+      - containerPort: 31096 
+        hostPort: 2196
+      - containerPort: 31100
+        hostPort: 2200
+      - containerPort: 31104 
+        hostPort: 2204
+      - containerPort: 31108
+        hostPort: 2208
+      - containerPort: 31112
+        hostPort: 2212
+      - containerPort: 31116
+        hostPort: 2216
+      - containerPort: 31120
+        hostPort: 2220
+      - containerPort: 31124
+        hostPort: 2224
+      - containerPort: 31128
+        hostPort: 2228
     extraMounts:
       - hostPath: ${pv_root}
         containerPath: ${pv_root}
@@ -549,6 +569,7 @@ EOF
                             echo "${WORKSPACE}/.mvn/maven.config contents:"
                             cat "${WORKSPACE}/.mvn/maven.config"
                             cp "${WORKSPACE}/.mvn/maven.config" "${result_root}"
+                            kubectl describe node kind-worker
                         '''
                         withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
                             withCredentials([

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

@@ -31,8 +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.IT_DEDICATEDMODE_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATEDMODE_NODEPORT;
 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;
@@ -86,7 +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;
+  private static int externalRestHttpsPort = IT_DEDICATEDMODE_NODEPORT;
 
   // operator constants
   private static HelmParams opHelmParams;
@@ -200,7 +200,7 @@ void testDedicatedModeSameNamespace() {
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
       externalRestHttpshost = "localhost";
-      externalRestHttpsPort = IT_DEDICATED_MODE_HOSTPORT;
+      externalRestHttpsPort = IT_DEDICATEDMODE_HOSTPORT;
       logger.info("Running in podman using Operator hostport {0}:{1}", externalRestHttpshost, externalRestHttpsPort);
     } else {
       logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);

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

@@ -47,10 +47,10 @@
 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.IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT;
-import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTPS_HOSTPORT;
-import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT;
-import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTPS_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTP_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOSTNAME;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -219,7 +219,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) throws Unknow
     if (!OKD) {
       logger.info("Installing Traefik controller using helm");
       traefikHelmParams = installAndVerifyTraefik(traefikNamespace, 
-          IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT, IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT).getHelmParams();
+          IT_EXTERNALLBTUNNELING_HTTP_NODEPORT, IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT).getHelmParams();
     }
 
     // Create SSL certificate and key using openSSL with SAN extension
@@ -296,10 +296,10 @@ void testExternalRmiAccessThruTraefik() {
     String service
         = TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3);
     logger.info("TRAEFIK_SERVICE {0} in {1}", service, traefikNamespace);
-    int httpTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT;
+    int httpTunnelingPort = IT_EXTERNALLBTUNNELING_HTTP_NODEPORT;
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      httpTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTP_HOSTPORT;
+      httpTunnelingPort = IT_EXTERNALLBTUNNELING_HTTP_HOSTPORT;
     }
     assertNotEquals(-1, httpTunnelingPort,
         "Could not get the Traefik HttpTunnelingPort service node port");
@@ -357,10 +357,10 @@ void testExternalRmiAccessThruTraefikHttpsTunneling() {
     String service
         = TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3);
     logger.info("TRAEFIK_SERVICE {0} in {1}", service, traefikNamespace);
-    int httpsTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT;
+    int httpsTunnelingPort = IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT;
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      httpsTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTPS_HOSTPORT;
+      httpsTunnelingPort = IT_EXTERNALLBTUNNELING_HTTPS_HOSTPORT;
     }
     assertNotEquals(-1, httpsTunnelingPort,
         "Could not get the Traefik HttpsTunnelingPort service node port");

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

@@ -42,8 +42,8 @@
 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.IT_EXTERNALNODEPORTSERVICE_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALNODEPORTSERVICE_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOSTNAME;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -159,7 +159,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     configTemplateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      configTemplateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
+      configTemplateMap.put("FREE_PORT", String.valueOf(IT_EXTERNALNODEPORTSERVICE_NODEPORT));
     } else {
       nextFreePort = getNextFreePort();      
       configTemplateMap.put("FREE_PORT", String.valueOf(nextFreePort));
@@ -230,7 +230,7 @@ void testExternalRmiAccessThruNodePortService() {
     templateMap.put("CLUSTER", clusterName);
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      templateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
+      templateMap.put("FREE_PORT", String.valueOf(IT_EXTERNALNODEPORTSERVICE_NODEPORT));
     } else {
       templateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
       templateMap.put("FREE_PORT", String.valueOf(nextFreePort));
@@ -265,7 +265,7 @@ void testExternalRmiAccessThruNodePortService() {
     String hostAndPort;
     if (TestConstants.KIND_CLUSTER
         && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-      hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", ITEXTERNALNODEPORTSERVICE_HOSTPORT);
+      hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", IT_EXTERNALNODEPORTSERVICE_HOSTPORT);
     } else {
       hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", httpTunnelingPort);
     }

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

@@ -49,9 +49,9 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
-import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT;
-import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
-import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTP_NODEPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTP_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -222,8 +222,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
     );
 
     // install and verify NGINX
-    nginxHelmParams = installAndVerifyNginx(nginxNamespace, ITHPACUSTOMNGINX_INGRESS_HTTP_NODEPORT,
-        ITHPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, (OKE_CLUSTER ? null : "NodePort"));
+    nginxHelmParams = installAndVerifyNginx(nginxNamespace, IT_HPACUSTOMNGINX_INGRESS_HTTP_NODEPORT,
+        IT_HPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, (OKE_CLUSTER ? null : "NodePort"));
 
     String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
     logger.info("NGINX service name: {0}", nginxServiceName);
@@ -238,7 +238,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
       } catch (UnknownHostException ex) {
         logger.severe(ex.getLocalizedMessage());
       }
-      nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
+      nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
     }
 
     // create cluster resouce with limits and requests in serverPod
@@ -314,7 +314,7 @@ void testHPAWithCustomMetrics() {
       } catch (UnknownHostException ex) {
         logger.severe(ex.getLocalizedMessage());
       }
-      nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
+      nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
       hostPort = host + ":" + nodeportshttp;
     }    
     String curlCmd =

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

@@ -28,8 +28,8 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ISTIO_HTTP_HOSTPORT;
-import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
-import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.OCNE;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
@@ -146,7 +146,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
 
     // install and verify operator
     installAndVerifyOperator(opNamespace, domain1Namespace, domain2Namespace);
-    prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
+    prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
   }
 
   /**
@@ -232,7 +232,7 @@ private void deployPrometheusAndVerify(String domainNamespace, String domainUid,
       if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT) && !OCNE) {
         try {
           hostPortPrometheus = InetAddress.getLocalHost().getHostAddress()
-              + ":" + IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
+              + ":" + IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
         } catch (UnknownHostException ex) {
           logger.severe(ex.getLocalizedMessage());
         }

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

@@ -32,10 +32,10 @@
 import org.junit.jupiter.api.TestMethodOrder;
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
-import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
-import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
-import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
-import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.NGINX_CHART_VERSION;
@@ -485,7 +485,7 @@ private static void createNginxTLSPathRoutingForTwoDomains() {
   private static int getNginxLbNodePort(String channelName) {
     if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
       return channelName.equals("https")
-          ? ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
+          ? IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
     } else {
       String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
       return getServiceNodePort(nginxNamespace, nginxServiceName, channelName);
@@ -519,8 +519,8 @@ private static NginxParams installNginxLB() {
       nodePortValue = "NodePort";
     }
 
-    NginxParams params = installAndVerifyNginx(nginxNamespace, ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
-        ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
+    NginxParams params = installAndVerifyNginx(nginxNamespace, IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
+        IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
 
     return params;
   }