Skip to content

Commit 719dd2d

Browse files
committed
Use ingress class
1 parent 85a1b71 commit 719dd2d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@
167167
import static org.junit.jupiter.api.Assertions.assertNotNull;
168168
import static org.junit.jupiter.api.Assertions.assertTrue;
169169

170-
171-
172170
/**
173171
* Verify Prometheus, Grafana, Webhook, Coordinator are installed and running
174172
* Verify the monitoring exporter installed in model in image domain can generate the WebLogic metrics.
@@ -359,8 +357,10 @@ void testEndToEndViaChart() throws Exception {
359357
try {
360358
logger.info("Create wdt domain and verify that it's running");
361359
createAndVerifyDomain(wdtImage, domain2Uid, domain2Namespace, "Image", replicaCount, false);
362-
ingressHost2List =
363-
createIngressForDomainAndVerify(domain2Uid, domain2Namespace, clusterNameMsPortMap);
360+
String ingressClassName = nginxHelmParams.getIngressClassName();
361+
ingressHost2List
362+
= createIngressForDomainAndVerify(domain2Uid, domain2Namespace, 0, clusterNameMsPortMap,
363+
false, ingressClassName, false, 0);
364364
logger.info("Installing Prometheus and Grafana");
365365
installPrometheusGrafana(PROMETHEUS_CHART_VERSION, GRAFANA_CHART_VERSION,
366366
domain2Namespace,
@@ -565,8 +565,10 @@ void testBasicFunctionality() throws Exception {
565565

566566
// create ingress for the domain
567567
logger.info("Creating ingress for domain {0} in namespace {1}", domain1Uid, domain1Namespace);
568-
ingressHost1List =
569-
createIngressForDomainAndVerify(domain4Uid, domain4Namespace, clusterNameMsPortMap, false);
568+
String ingressClassName = nginxHelmParams.getIngressClassName();
569+
ingressHost1List
570+
= createIngressForDomainAndVerify(domain4Uid, domain4Namespace, 0, clusterNameMsPortMap,
571+
false, ingressClassName, false, 0);
570572
verifyMonExpAppAccessThroughNginx(ingressHost1List.get(0), 1);
571573
installPrometheusGrafana(PROMETHEUS_CHART_VERSION, GRAFANA_CHART_VERSION,
572574
domain4Namespace,

0 commit comments

Comments
 (0)