|
167 | 167 | import static org.junit.jupiter.api.Assertions.assertNotNull;
|
168 | 168 | import static org.junit.jupiter.api.Assertions.assertTrue;
|
169 | 169 |
|
170 |
| - |
171 |
| - |
172 | 170 | /**
|
173 | 171 | * Verify Prometheus, Grafana, Webhook, Coordinator are installed and running
|
174 | 172 | * Verify the monitoring exporter installed in model in image domain can generate the WebLogic metrics.
|
@@ -359,8 +357,10 @@ void testEndToEndViaChart() throws Exception {
|
359 | 357 | try {
|
360 | 358 | logger.info("Create wdt domain and verify that it's running");
|
361 | 359 | 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); |
364 | 364 | logger.info("Installing Prometheus and Grafana");
|
365 | 365 | installPrometheusGrafana(PROMETHEUS_CHART_VERSION, GRAFANA_CHART_VERSION,
|
366 | 366 | domain2Namespace,
|
@@ -565,8 +565,10 @@ void testBasicFunctionality() throws Exception {
|
565 | 565 |
|
566 | 566 | // create ingress for the domain
|
567 | 567 | 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); |
570 | 572 | verifyMonExpAppAccessThroughNginx(ingressHost1List.get(0), 1);
|
571 | 573 | installPrometheusGrafana(PROMETHEUS_CHART_VERSION, GRAFANA_CHART_VERSION,
|
572 | 574 | domain4Namespace,
|
|
0 commit comments