Skip to content

Commit 5e1bc79

Browse files
sankarpnjshum2479
authored andcommitted
Fix for nightly failures in release 4.2
1 parent 00c4906 commit 5e1bc79

38 files changed

+882
-330
lines changed

Jenkinsfile.podman

Lines changed: 75 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -390,66 +390,86 @@ nodes:
390390
- role: worker
391391
image: ${kind_image}
392392
extraPortMappings:
393-
- containerPort: 30880
394-
hostPort: 2080
395-
protocol: TCP
396-
- containerPort: 30443
397-
hostPort: 2443
398-
protocol: TCP
399-
- containerPort: 31880
400-
hostPort: 2180
401-
protocol: TCP
402-
- containerPort: 31443
403-
hostPort: 2543
404-
- containerPort: 30881
405-
hostPort: 2081
406-
protocol: TCP
407-
- containerPort: 30444
408-
hostPort: 2444
409-
protocol: TCP
393+
- containerPort: 30511
394+
hostPort: 1511
410395
- containerPort: 32480
411396
hostPort: 2480
412397
- containerPort: 32490
413-
hostPort: 2490
414-
- containerPort: 32156
398+
hostPort: 2490
399+
- containerPort: 30080
400+
hostPort: 2080
401+
- containerPort: 30443
402+
hostPort: 2043
403+
- containerPort: 30180
404+
hostPort: 2090
405+
- containerPort: 30143
406+
hostPort: 2053
407+
- containerPort: 31000
408+
hostPort: 2100
409+
- containerPort: 31004
410+
hostPort: 2104
411+
- containerPort: 31008
412+
hostPort: 2108
413+
- containerPort: 31012
414+
hostPort: 2112
415+
- containerPort: 31016
416+
hostPort: 2116
417+
- containerPort: 31020
418+
hostPort: 2120
419+
- containerPort: 31024
420+
hostPort: 2124
421+
- containerPort: 31028
422+
hostPort: 2128
423+
- containerPort: 31032
424+
hostPort: 2132
425+
- containerPort: 31036
426+
hostPort: 2136
427+
- containerPort: 31040
428+
hostPort: 2140
429+
- containerPort: 31044
430+
hostPort: 2144
431+
- containerPort: 31048
432+
hostPort: 2148
433+
- containerPort: 31052
434+
hostPort: 2152
435+
- containerPort: 31056
415436
hostPort: 2156
416-
- containerPort: 30511
417-
hostPort: 1511
418-
- containerPort: 32159
437+
- containerPort: 31060
419438
hostPort: 2160
420-
- containerPort: 32169
439+
- containerPort: 31064
440+
hostPort: 2164
441+
- containerPort: 31068
442+
hostPort: 2168
443+
- containerPort: 31072
421444
hostPort: 2172
422-
protocol: TCP
423-
- containerPort: 32170
424-
hostPort: 2173
425-
protocol: TCP
426-
- containerPort: 32189
427-
hostPort: 2182
428-
protocol: TCP
429-
- containerPort: 32185
430-
hostPort: 2175
431-
protocol: TCP
432-
- containerPort: 32143
433-
hostPort: 2143
434-
protocol: TCP
435-
- containerPort: 32343
436-
hostPort: 2343
437-
protocol: TCP
438-
- containerPort: 32331
439-
hostPort: 2331
440-
protocol: TCP
441-
- containerPort: 31781
442-
hostPort: 2781
443-
protocol: TCP
444-
- containerPort: 31744
445-
hostPort: 2782
446-
protocol: TCP
447-
- containerPort: 31785
448-
hostPort: 2785
449-
protocol: TCP
450-
- containerPort: 31746
451-
hostPort: 2786
452-
protocol: TCP
445+
- containerPort: 31076
446+
hostPort: 2176
447+
- containerPort: 31080
448+
hostPort: 2180
449+
- containerPort: 31084
450+
hostPort: 2184
451+
- containerPort: 31088
452+
hostPort: 2188
453+
- containerPort: 31092
454+
hostPort: 2192
455+
- containerPort: 31096
456+
hostPort: 2196
457+
- containerPort: 31100
458+
hostPort: 2200
459+
- containerPort: 31104
460+
hostPort: 2204
461+
- containerPort: 31108
462+
hostPort: 2208
463+
- containerPort: 31112
464+
hostPort: 2212
465+
- containerPort: 31116
466+
hostPort: 2216
467+
- containerPort: 31120
468+
hostPort: 2220
469+
- containerPort: 31124
470+
hostPort: 2224
471+
- containerPort: 31128
472+
hostPort: 2228
453473
extraMounts:
454474
- hostPath: ${pv_root}
455475
containerPath: ${pv_root}
@@ -549,6 +569,7 @@ EOF
549569
echo "${WORKSPACE}/.mvn/maven.config contents:"
550570
cat "${WORKSPACE}/.mvn/maven.config"
551571
cp "${WORKSPACE}/.mvn/maven.config" "${result_root}"
572+
kubectl describe node kind-worker
552573
'''
553574
withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
554575
withCredentials([

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3232
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3333
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
34-
import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATED_MODE_CONAINERPORT;
35-
import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATED_MODE_HOSTPORT;
34+
import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATEDMODE_HOSTPORT;
35+
import static oracle.weblogic.kubernetes.TestConstants.IT_DEDICATEDMODE_NODEPORT;
3636
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
3737
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
3838
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
@@ -86,7 +86,7 @@ class ItDedicatedMode {
8686
domainUid + "-" + ADMIN_SERVER_NAME_BASE;
8787
private final String managedServerPodPrefix =
8888
domainUid + "-" + MANAGED_SERVER_NAME_BASE;
89-
private static int externalRestHttpsPort = IT_DEDICATED_MODE_CONAINERPORT;
89+
private static int externalRestHttpsPort = IT_DEDICATEDMODE_NODEPORT;
9090

9191
// operator constants
9292
private static HelmParams opHelmParams;
@@ -200,7 +200,7 @@ void testDedicatedModeSameNamespace() {
200200
if (TestConstants.KIND_CLUSTER
201201
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
202202
externalRestHttpshost = "localhost";
203-
externalRestHttpsPort = IT_DEDICATED_MODE_HOSTPORT;
203+
externalRestHttpsPort = IT_DEDICATEDMODE_HOSTPORT;
204204
logger.info("Running in podman using Operator hostport {0}:{1}", externalRestHttpshost, externalRestHttpsPort);
205205
} else {
206206
logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4848
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
4949
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
50-
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT;
51-
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTPS_HOSTPORT;
52-
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT;
53-
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLB_TUNNELING_HTTP_HOSTPORT;
50+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTPS_HOSTPORT;
51+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT;
52+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTP_HOSTPORT;
53+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALLBTUNNELING_HTTP_NODEPORT;
5454
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
5555
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOSTNAME;
5656
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -219,7 +219,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) throws Unknow
219219
if (!OKD) {
220220
logger.info("Installing Traefik controller using helm");
221221
traefikHelmParams = installAndVerifyTraefik(traefikNamespace,
222-
IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT, IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT).getHelmParams();
222+
IT_EXTERNALLBTUNNELING_HTTP_NODEPORT, IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT).getHelmParams();
223223
}
224224

225225
// Create SSL certificate and key using openSSL with SAN extension
@@ -296,10 +296,10 @@ void testExternalRmiAccessThruTraefik() {
296296
String service
297297
= TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3);
298298
logger.info("TRAEFIK_SERVICE {0} in {1}", service, traefikNamespace);
299-
int httpTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT;
299+
int httpTunnelingPort = IT_EXTERNALLBTUNNELING_HTTP_NODEPORT;
300300
if (TestConstants.KIND_CLUSTER
301301
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
302-
httpTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTP_HOSTPORT;
302+
httpTunnelingPort = IT_EXTERNALLBTUNNELING_HTTP_HOSTPORT;
303303
}
304304
assertNotEquals(-1, httpTunnelingPort,
305305
"Could not get the Traefik HttpTunnelingPort service node port");
@@ -357,10 +357,10 @@ void testExternalRmiAccessThruTraefikHttpsTunneling() {
357357
String service
358358
= TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3);
359359
logger.info("TRAEFIK_SERVICE {0} in {1}", service, traefikNamespace);
360-
int httpsTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT;
360+
int httpsTunnelingPort = IT_EXTERNALLBTUNNELING_HTTPS_NODEPORT;
361361
if (TestConstants.KIND_CLUSTER
362362
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
363-
httpsTunnelingPort = IT_EXTERNALLB_TUNNELING_HTTPS_HOSTPORT;
363+
httpsTunnelingPort = IT_EXTERNALLBTUNNELING_HTTPS_HOSTPORT;
364364
}
365365
assertNotEquals(-1, httpsTunnelingPort,
366366
"Could not get the Traefik HttpsTunnelingPort service node port");

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4343
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
4444
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
45-
import static oracle.weblogic.kubernetes.TestConstants.ITEXTERNALNODEPORTSERVICE_CONAINERPORT;
46-
import static oracle.weblogic.kubernetes.TestConstants.ITEXTERNALNODEPORTSERVICE_HOSTPORT;
45+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALNODEPORTSERVICE_HOSTPORT;
46+
import static oracle.weblogic.kubernetes.TestConstants.IT_EXTERNALNODEPORTSERVICE_NODEPORT;
4747
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
4848
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOSTNAME;
4949
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -159,7 +159,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
159159
configTemplateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
160160
if (TestConstants.KIND_CLUSTER
161161
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
162-
configTemplateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
162+
configTemplateMap.put("FREE_PORT", String.valueOf(IT_EXTERNALNODEPORTSERVICE_NODEPORT));
163163
} else {
164164
nextFreePort = getNextFreePort();
165165
configTemplateMap.put("FREE_PORT", String.valueOf(nextFreePort));
@@ -230,7 +230,7 @@ void testExternalRmiAccessThruNodePortService() {
230230
templateMap.put("CLUSTER", clusterName);
231231
if (TestConstants.KIND_CLUSTER
232232
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
233-
templateMap.put("FREE_PORT", String.valueOf(ITEXTERNALNODEPORTSERVICE_CONAINERPORT));
233+
templateMap.put("FREE_PORT", String.valueOf(IT_EXTERNALNODEPORTSERVICE_NODEPORT));
234234
} else {
235235
templateMap.put("INGRESS_HOST", K8S_NODEPORT_HOST);
236236
templateMap.put("FREE_PORT", String.valueOf(nextFreePort));
@@ -265,7 +265,7 @@ void testExternalRmiAccessThruNodePortService() {
265265
String hostAndPort;
266266
if (TestConstants.KIND_CLUSTER
267267
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
268-
hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", ITEXTERNALNODEPORTSERVICE_HOSTPORT);
268+
hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", IT_EXTERNALNODEPORTSERVICE_HOSTPORT);
269269
} else {
270270
hostAndPort = getHostAndPort(clusterSvcRouteHost + ":80", httpTunnelingPort);
271271
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
5050
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
5151
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
52-
import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT;
53-
import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
54-
import static oracle.weblogic.kubernetes.TestConstants.ITHPACUSTOMNGINX_INGRESS_HTTP_NODEPORT;
52+
import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT;
53+
import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
54+
import static oracle.weblogic.kubernetes.TestConstants.IT_HPACUSTOMNGINX_INGRESS_HTTP_NODEPORT;
5555
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
5656
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
5757
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -222,8 +222,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
222222
);
223223

224224
// install and verify NGINX
225-
nginxHelmParams = installAndVerifyNginx(nginxNamespace, ITHPACUSTOMNGINX_INGRESS_HTTP_NODEPORT,
226-
ITHPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, (OKE_CLUSTER ? null : "NodePort"));
225+
nginxHelmParams = installAndVerifyNginx(nginxNamespace, IT_HPACUSTOMNGINX_INGRESS_HTTP_NODEPORT,
226+
IT_HPACUSTOMNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, (OKE_CLUSTER ? null : "NodePort"));
227227

228228
String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
229229
logger.info("NGINX service name: {0}", nginxServiceName);
@@ -238,7 +238,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
238238
} catch (UnknownHostException ex) {
239239
logger.severe(ex.getLocalizedMessage());
240240
}
241-
nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
241+
nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
242242
}
243243

244244
// create cluster resouce with limits and requests in serverPod
@@ -314,7 +314,7 @@ void testHPAWithCustomMetrics() {
314314
} catch (UnknownHostException ex) {
315315
logger.severe(ex.getLocalizedMessage());
316316
}
317-
nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
317+
nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
318318
hostPort = host + ":" + nodeportshttp;
319319
}
320320
String curlCmd =

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
2929
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3030
import static oracle.weblogic.kubernetes.TestConstants.ISTIO_HTTP_HOSTPORT;
31-
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
32-
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
31+
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
32+
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
3333
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3434
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
3535
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
@@ -146,7 +146,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
146146

147147
// install and verify operator
148148
installAndVerifyOperator(opNamespace, domain1Namespace, domain2Namespace);
149-
prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
149+
prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
150150
}
151151

152152
/**
@@ -232,7 +232,7 @@ private void deployPrometheusAndVerify(String domainNamespace, String domainUid,
232232
if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT) && !OCNE) {
233233
try {
234234
hostPortPrometheus = InetAddress.getLocalHost().getHostAddress()
235-
+ ":" + IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
235+
+ ":" + IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
236236
} catch (UnknownHostException ex) {
237237
logger.severe(ex.getLocalizedMessage());
238238
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.junit.jupiter.api.TestMethodOrder;
3333

3434
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
35-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
36-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
37-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
38-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
35+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
36+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
37+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
38+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
3939
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
4040
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
4141
import static oracle.weblogic.kubernetes.TestConstants.NGINX_CHART_VERSION;
@@ -485,7 +485,7 @@ private static void createNginxTLSPathRoutingForTwoDomains() {
485485
private static int getNginxLbNodePort(String channelName) {
486486
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
487487
return channelName.equals("https")
488-
? ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
488+
? IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
489489
} else {
490490
String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
491491
return getServiceNodePort(nginxNamespace, nginxServiceName, channelName);
@@ -519,8 +519,8 @@ private static NginxParams installNginxLB() {
519519
nodePortValue = "NodePort";
520520
}
521521

522-
NginxParams params = installAndVerifyNginx(nginxNamespace, ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
523-
ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
522+
NginxParams params = installAndVerifyNginx(nginxNamespace, IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
523+
IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
524524

525525
return params;
526526
}

0 commit comments

Comments
 (0)