Skip to content

Commit 8b0ba27

Browse files
rjeberhardrjeberhard
committed
Merge branch 'owls117583' into 'main'
podman conversion for ItWebAppAccessWithDBTest See merge request weblogic-cloud/weblogic-kubernetes-operator!4680
2 parents 95390f9 + 88022db commit 8b0ba27

16 files changed

+122
-93
lines changed

‎Jenkinsfile.podman

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ nodes:
436436
- containerPort: 32343
437437
hostPort: 2343
438438
protocol: TCP
439+
- containerPort: 30538
440+
hostPort: 2538
441+
protocol: TCP
442+
- containerPort: 30544
443+
hostPort: 2539
444+
protocol: TCP
439445
- containerPort: 32331
440446
hostPort: 2331
441447
protocol: TCP
@@ -450,7 +456,7 @@ nodes:
450456
protocol: TCP
451457
- containerPort: 31746
452458
hostPort: 2786
453-
protocol: TCP
459+
protocol: TCP
454460
extraMounts:
455461
- hostPath: ${pv_root}
456462
containerPath: ${pv_root}

‎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;
@@ -88,7 +88,7 @@ class ItDedicatedMode {
8888
domainUid + "-" + ADMIN_SERVER_NAME_BASE;
8989
private final String managedServerPodPrefix =
9090
domainUid + "-" + MANAGED_SERVER_NAME_BASE;
91-
private static int externalRestHttpsPort = IT_DEDICATED_MODE_CONAINERPORT;
91+
private static int externalRestHttpsPort = IT_DEDICATEDMODE_NODEPORT;
9292

9393
// operator constants
9494
private static HelmParams opHelmParams;
@@ -202,7 +202,7 @@ void testDedicatedModeSameNamespace() {
202202
if (TestConstants.KIND_CLUSTER
203203
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
204204
externalRestHttpshost = "localhost";
205-
externalRestHttpsPort = IT_DEDICATED_MODE_HOSTPORT;
205+
externalRestHttpsPort = IT_DEDICATEDMODE_HOSTPORT;
206206
logger.info("Running in podman using Operator hostport {0}:{1}", externalRestHttpshost, externalRestHttpsPort);
207207
} else {
208208
logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);

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

Lines changed: 10 additions & 10 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;
@@ -218,8 +218,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) throws Unknow
218218

219219
if (!OKD) {
220220
logger.info("Installing Traefik controller using helm");
221-
traefikHelmParams = installAndVerifyTraefik(traefikNamespace,
222-
IT_EXTERNALLB_TUNNELING_HTTP_CONAINERPORT, IT_EXTERNALLB_TUNNELING_HTTPS_CONAINERPORT).getHelmParams();
221+
traefikHelmParams = installAndVerifyTraefik(traefikNamespace,
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
String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
228228
logger.info("NGINX service name: {0}", nginxServiceName);
229229
nodeportshttp = getServiceNodePort(nginxNamespace, nginxServiceName, "http");
@@ -237,7 +237,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
237237
} catch (UnknownHostException ex) {
238238
logger.severe(ex.getLocalizedMessage());
239239
}
240-
nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
240+
nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
241241
}
242242

243243
// create cluster resouce with limits and requests in serverPod
@@ -313,7 +313,7 @@ void testHPAWithCustomMetrics() {
313313
} catch (UnknownHostException ex) {
314314
logger.severe(ex.getLocalizedMessage());
315315
}
316-
nodeportshttp = ITHPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
316+
nodeportshttp = IT_HPACUSTOMNGINX_INGRESS_HTTP_HOSTPORT;
317317
hostPort = host + ":" + nodeportshttp;
318318
}
319319
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
@@ -27,8 +27,8 @@
2727
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
2828
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
2929
import static oracle.weblogic.kubernetes.TestConstants.ISTIO_HTTP_HOSTPORT;
30-
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
31-
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
30+
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
31+
import static oracle.weblogic.kubernetes.TestConstants.IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
3232
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3333
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
3434
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
@@ -145,7 +145,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
145145

146146
// install and verify operator
147147
installAndVerifyOperator(opNamespace, domain1Namespace, domain2Namespace);
148-
prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROM_HTTP_CONAINERPORT;
148+
prometheusPort = IT_ISTIOMONITORINGEXPORTER_PROMETHEUS_HTTP_NODEPORT;
149149
}
150150

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

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

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

3535
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
36-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
37-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
38-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
39-
import static oracle.weblogic.kubernetes.TestConstants.ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
36+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT;
37+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT;
38+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
39+
import static oracle.weblogic.kubernetes.TestConstants.IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT;
4040
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
4141
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
4242
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
@@ -497,7 +497,7 @@ private static void createNginxTLSPathRoutingForTwoDomains() {
497497
private static int getNginxLbNodePort(String channelName) {
498498
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
499499
return channelName.equals("https")
500-
? ITLBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : ITLBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
500+
? IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_HOSTPORT : IT_LBTWODOMAINSNGINX_INGRESS_HTTP_HOSTPORT;
501501
} else {
502502
String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
503503
return getServiceNodePort(nginxNamespace, nginxServiceName, channelName);
@@ -530,8 +530,8 @@ private static NginxParams installNginxLB() {
530530
nodePortValue = "NodePort";
531531
}
532532

533-
NginxParams params = installAndVerifyNginx(nginxNamespace, ITLBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
534-
ITLBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
533+
NginxParams params = installAndVerifyNginx(nginxNamespace, IT_LBTWODOMAINSNGINX_INGRESS_HTTP_NODEPORT,
534+
IT_LBTWODOMAINSNGINX_INGRESS_HTTPS_NODEPORT, NGINX_CHART_VERSION, nodePortValue);
535535

536536
return params;
537537
}

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomainUpgradeToSecureMode.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
5555
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_PASSWORD_DEFAULT;
5656
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_USERNAME_DEFAULT;
57-
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTPS_CONAINERPORT;
5857
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTPS_HOSTPORT;
59-
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTP_CONAINERPORT;
58+
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTPS_NODEPORT;
6059
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTP_HOSTPORT;
60+
import static oracle.weblogic.kubernetes.TestConstants.IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTP_NODEPORT;
6161
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6262
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
6363
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
@@ -872,9 +872,9 @@ private <K, V> Map<K, V> getPodsWithTimeStamps(String domainNamespace, String do
872872
private static void installNginx() {
873873
// install and verify Nginx ingress controller
874874
logger.info("Installing Nginx controller using helm");
875-
nginxParams = installAndVerifyNginx(ingressNamespace,
876-
IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTP_CONAINERPORT,
877-
IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTPS_CONAINERPORT);
875+
nginxParams = installAndVerifyNginx(ingressNamespace,
876+
IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTP_NODEPORT,
877+
IT_ITMIIDOMAINUPGRADETOSECUREMODE_HTTPS_NODEPORT);
878878
}
879879

880880
/**

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterMetricsFiltering.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4040
import static oracle.weblogic.kubernetes.TestConstants.GRAFANA_CHART_VERSION;
4141
import static oracle.weblogic.kubernetes.TestConstants.INGRESS_CLASS_FILE_NAME;
42-
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
42+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
4343
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
4444
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4545
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
@@ -533,7 +533,7 @@ private void installPrometheusGrafana(String promChartVersion,
533533
if (TestConstants.KIND_CLUSTER
534534
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
535535
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
536-
nodeportPrometheus = IT_MONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
536+
nodeportPrometheus = IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
537537
}
538538
hostPortPrometheus = host + ":" + nodeportPrometheus;
539539

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterSamples.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
5757
import static oracle.weblogic.kubernetes.TestConstants.GRAFANA_CHART_VERSION;
5858
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
59-
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
59+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
6060
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6161
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
6262
import static oracle.weblogic.kubernetes.TestConstants.NGINX_INGRESS_HTTPS_HOSTPORT;
@@ -429,7 +429,7 @@ private void installPrometheusGrafana(String promChartVersion,
429429
String host = formatIPv6Host(K8S_NODEPORT_HOST);
430430
if (TestConstants.KIND_CLUSTER
431431
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
432-
nodeportPrometheus = IT_MONITORINGEXPORTER_PROM_HTTP_HOSTPORT;
432+
nodeportPrometheus = IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
433433
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
434434
}
435435
prometheusDomainRegexValue = prometheusRegexValue;

0 commit comments

Comments
 (0)