Skip to content

Commit 54bbf58

Browse files
jshum2479jshum2479
committed
Merge branch 'fix-for-mon' into 'main'
Fix for nightly failures in main in monitoring exporter See merge request weblogic-cloud/weblogic-kubernetes-operator!4686
2 parents c06bc07 + 0abf3ae commit 54bbf58

25 files changed

+317
-239
lines changed

‎Jenkinsfile.podman

Lines changed: 74 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -395,72 +395,86 @@ nodes:
395395
- role: worker
396396
image: ${kind_image}
397397
extraPortMappings:
398-
- containerPort: 30880
399-
hostPort: 2080
400-
protocol: TCP
401-
- containerPort: 30443
402-
hostPort: 2443
403-
protocol: TCP
404-
- containerPort: 31880
405-
hostPort: 2180
406-
protocol: TCP
407-
- containerPort: 31443
408-
hostPort: 2543
409-
- containerPort: 30881
410-
hostPort: 2081
411-
protocol: TCP
412-
- containerPort: 30444
413-
hostPort: 2444
414-
protocol: TCP
398+
- containerPort: 30511
399+
hostPort: 1511
415400
- containerPort: 32480
416401
hostPort: 2480
417402
- containerPort: 32490
418-
hostPort: 2490
419-
- containerPort: 32156
403+
hostPort: 2490
404+
- containerPort: 30080
405+
hostPort: 2080
406+
- containerPort: 30443
407+
hostPort: 2043
408+
- containerPort: 30180
409+
hostPort: 2090
410+
- containerPort: 30143
411+
hostPort: 2053
412+
- containerPort: 31000
413+
hostPort: 2100
414+
- containerPort: 31004
415+
hostPort: 2104
416+
- containerPort: 31008
417+
hostPort: 2108
418+
- containerPort: 31012
419+
hostPort: 2112
420+
- containerPort: 31016
421+
hostPort: 2116
422+
- containerPort: 31020
423+
hostPort: 2120
424+
- containerPort: 31024
425+
hostPort: 2124
426+
- containerPort: 31028
427+
hostPort: 2128
428+
- containerPort: 31032
429+
hostPort: 2132
430+
- containerPort: 31036
431+
hostPort: 2136
432+
- containerPort: 31040
433+
hostPort: 2140
434+
- containerPort: 31044
435+
hostPort: 2144
436+
- containerPort: 31048
437+
hostPort: 2148
438+
- containerPort: 31052
439+
hostPort: 2152
440+
- containerPort: 31056
420441
hostPort: 2156
421-
- containerPort: 30511
422-
hostPort: 1511
423-
- containerPort: 32159
442+
- containerPort: 31060
424443
hostPort: 2160
425-
- containerPort: 32169
444+
- containerPort: 31064
445+
hostPort: 2164
446+
- containerPort: 31068
447+
hostPort: 2168
448+
- containerPort: 31072
426449
hostPort: 2172
427-
protocol: TCP
428-
- containerPort: 32170
429-
hostPort: 2173
430-
protocol: TCP
431-
- containerPort: 32189
432-
hostPort: 2182
433-
protocol: TCP
434-
- containerPort: 32185
435-
hostPort: 2175
436-
protocol: TCP
437-
- containerPort: 32143
438-
hostPort: 2143
439-
protocol: TCP
440-
- containerPort: 32343
441-
hostPort: 2343
442-
protocol: TCP
443-
- containerPort: 30538
444-
hostPort: 2538
445-
protocol: TCP
446-
- containerPort: 30544
447-
hostPort: 2539
448-
protocol: TCP
449-
- containerPort: 32331
450-
hostPort: 2331
451-
protocol: TCP
452-
- containerPort: 31781
453-
hostPort: 2781
454-
protocol: TCP
455-
- containerPort: 31744
456-
hostPort: 2782
457-
protocol: TCP
458-
- containerPort: 31785
459-
hostPort: 2785
460-
protocol: TCP
461-
- containerPort: 31746
462-
hostPort: 2786
463-
protocol: TCP
450+
- containerPort: 31076
451+
hostPort: 2176
452+
- containerPort: 31080
453+
hostPort: 2180
454+
- containerPort: 31084
455+
hostPort: 2184
456+
- containerPort: 31088
457+
hostPort: 2188
458+
- containerPort: 31092
459+
hostPort: 2192
460+
- containerPort: 31096
461+
hostPort: 2196
462+
- containerPort: 31100
463+
hostPort: 2200
464+
- containerPort: 31104
465+
hostPort: 2204
466+
- containerPort: 31108
467+
hostPort: 2208
468+
- containerPort: 31112
469+
hostPort: 2212
470+
- containerPort: 31116
471+
hostPort: 2216
472+
- containerPort: 31120
473+
hostPort: 2220
474+
- containerPort: 31124
475+
hostPort: 2224
476+
- containerPort: 31128
477+
hostPort: 2228
464478
extraMounts:
465479
- hostPath: ${pv_root}
466480
containerPath: ${pv_root}

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

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,19 @@
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_PROMETHEUS_HTTP_HOSTPORT;
42+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERMF_ALERT_HTTP_NODEPORT;
43+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERMF_PROMETHEUS_HTTP_HOSTPORT;
44+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERMF_PROMETHEUS_HTTP_NODEPORT;
4345
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
46+
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
4447
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4548
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
4649
import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CHART_VERSION;
4750
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
4851
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTPS_HOSTPORT;
4952
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
53+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
54+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
5055
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
5156
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
5257
import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
@@ -180,8 +185,7 @@ public void initAll(@Namespaces(4) List<String> namespaces) throws IOException {
180185
miiImage = MonitoringUtils.createAndVerifyMiiImage(monitoringExporterAppDir, modelList,
181186
STICKYSESS_APP_NAME, SESSMIGR_APP_NAME, MONEXP_IMAGE_NAME);
182187
host = formatIPv6Host(K8S_NODEPORT_HOST);
183-
if (TestConstants.KIND_CLUSTER
184-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
188+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
185189
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
186190
}
187191

@@ -521,19 +525,26 @@ private void installPrometheusGrafana(String promChartVersion,
521525
final String prometheusRegexValue = String.format("regex: %s;%s", domainNS, domainUid);
522526
if (promHelmParams == null) {
523527
cleanupPromGrafanaClusterRoles(prometheusReleaseName, grafanaReleaseName);
524-
String promHelmValuesFileDir = Paths.get(RESULTS_ROOT,this.getClass().getSimpleName(),
528+
String promHelmValuesFileDir = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(),
525529
"prometheus" + releaseSuffix).toString();
526-
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
527-
monitoringNS,
528-
promChartVersion,
529-
prometheusRegexValue, promHelmValuesFileDir);
530+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
531+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
532+
monitoringNS,
533+
promChartVersion,
534+
prometheusRegexValue, promHelmValuesFileDir, null,
535+
IT_MONITORINGEXPORTERMF_PROMETHEUS_HTTP_NODEPORT, IT_MONITORINGEXPORTERMF_ALERT_HTTP_NODEPORT);
536+
} else {
537+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
538+
monitoringNS,
539+
promChartVersion,
540+
prometheusRegexValue, promHelmValuesFileDir);
541+
}
530542
assertNotNull(promHelmParams, " Failed to install prometheus");
531543
nodeportPrometheus = promHelmParams.getNodePortServer();
532544
String host = formatIPv6Host(K8S_NODEPORT_HOST);
533-
if (TestConstants.KIND_CLUSTER
534-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
545+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
535546
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
536-
nodeportPrometheus = IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
547+
nodeportPrometheus = IT_MONITORINGEXPORTERMF_PROMETHEUS_HTTP_HOSTPORT;
537548
}
538549
hostPortPrometheus = host + ":" + nodeportPrometheus;
539550

@@ -753,7 +764,7 @@ private void appendConfiguration(String configFile) throws Exception {
753764
private static void installTraefikIngressController() throws IOException {
754765
// install and verify Traefik
755766
logger.info("Installing Traefik controller using helm");
756-
if (TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
767+
if (WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
757768
traefikParams = installAndVerifyTraefik(traefikNamespace, 0, 0);
758769
traefikHelmParams = traefikParams.getHelmParams();
759770
ingressClassName = traefikParams.getIngressClassName();
@@ -763,8 +774,7 @@ private static void installTraefikIngressController() throws IOException {
763774
}
764775

765776
private int getTraefikLbNodePort(boolean isHttps) {
766-
if (TestConstants.KIND_CLUSTER
767-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
777+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
768778
return isHttps ? TRAEFIK_INGRESS_HTTPS_HOSTPORT : TRAEFIK_INGRESS_HTTP_HOSTPORT;
769779
}
770780
logger.info("Getting web node port for Traefik loadbalancer {0}", traefikHelmParams.getReleaseName());

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

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@
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_PROMETHEUS_HTTP_HOSTPORT;
59+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_ALERT_HTTP_NODEPORT;
60+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTPS_HOSTPORT;
61+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTPS_NODEPORT;
62+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTP_HOSTPORT;
63+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTP_NODEPORT;
64+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_PROMETHEUS_HTTP_HOSTPORT;
65+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSAMPLES_PROMETHEUS_HTTP_NODEPORT;
6066
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
67+
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
6168
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
62-
import static oracle.weblogic.kubernetes.TestConstants.NGINX_INGRESS_HTTPS_HOSTPORT;
63-
import static oracle.weblogic.kubernetes.TestConstants.NGINX_INGRESS_HTTPS_NODEPORT;
64-
import static oracle.weblogic.kubernetes.TestConstants.NGINX_INGRESS_HTTP_HOSTPORT;
65-
import static oracle.weblogic.kubernetes.TestConstants.NGINX_INGRESS_HTTP_NODEPORT;
6669
import static oracle.weblogic.kubernetes.TestConstants.OKD;
6770
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
6871
import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CHART_VERSION;
@@ -71,6 +74,8 @@
7174
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
7275
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
7376
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
77+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
78+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
7479
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
7580
import static oracle.weblogic.kubernetes.actions.ActionConstants.WLS;
7681
import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
@@ -247,21 +252,20 @@ public static void initAll(@Namespaces(6) List<String> namespaces) {
247252
SESSMIGR_APP_NAME, MONEXP_IMAGE_NAME);
248253
if (!OKD) {
249254
// install and verify NGINX
250-
if (!OKE_CLUSTER_PRIVATEIP) {
251-
nginxHelmParams = installAndVerifyNginx(nginxNamespace,
252-
NGINX_INGRESS_HTTP_NODEPORT, NGINX_INGRESS_HTTPS_NODEPORT);
255+
if (OKE_CLUSTER_PRIVATEIP) {
256+
nginxHelmParams = installAndVerifyNginx(nginxNamespace, 0, 0);
253257
} else {
254258
nginxHelmParams = installAndVerifyNginx(nginxNamespace,
255-
0,0);
259+
IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTP_NODEPORT,
260+
IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTPS_NODEPORT);
256261
}
257262
String nginxServiceName = nginxHelmParams.getHelmParams().getReleaseName() + "-ingress-nginx-controller";
258263
ingressIP = getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) != null
259264
? getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) : K8S_NODEPORT_HOST;
260265
logger.info("NGINX service name: {0}", nginxServiceName);
261-
if (TestConstants.KIND_CLUSTER
262-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
263-
nodeportshttp = NGINX_INGRESS_HTTP_HOSTPORT;
264-
nodeportshttps = NGINX_INGRESS_HTTPS_HOSTPORT;
266+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
267+
nodeportshttp = IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTP_HOSTPORT;
268+
nodeportshttps = IT_MONITORINGEXPORTERSAMPLES_NGINX_HTTPS_HOSTPORT;
265269
} else {
266270
nodeportshttp = getServiceNodePort(nginxNamespace, nginxServiceName, "http");
267271
nodeportshttps = getServiceNodePort(nginxNamespace, nginxServiceName, "https");
@@ -418,18 +422,23 @@ private void installPrometheusGrafana(String promChartVersion,
418422
cleanupPromGrafanaClusterRoles(prometheusReleaseName,grafanaReleaseName);
419423
String promHelmValuesFileDir = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(),
420424
"prometheus" + releaseSuffix).toString();
421-
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
422-
monitoringNS,
423-
promChartVersion,
424-
prometheusRegexValue,
425-
promHelmValuesFileDir,
426-
webhookNS);
425+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
426+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
427+
monitoringNS,
428+
promChartVersion,
429+
prometheusRegexValue, promHelmValuesFileDir, webhookNS,
430+
IT_MONITORINGEXPORTERSAMPLES_PROMETHEUS_HTTP_NODEPORT, IT_MONITORINGEXPORTERSAMPLES_ALERT_HTTP_NODEPORT);
431+
} else {
432+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
433+
monitoringNS,
434+
promChartVersion,
435+
prometheusRegexValue, promHelmValuesFileDir, webhookNS);
436+
}
427437
assertNotNull(promHelmParams, " Failed to install prometheus");
428438
nodeportPrometheus = promHelmParams.getNodePortServer();
429439
String host = formatIPv6Host(K8S_NODEPORT_HOST);
430-
if (TestConstants.KIND_CLUSTER
431-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
432-
nodeportPrometheus = IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
440+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
441+
nodeportPrometheus = IT_MONITORINGEXPORTERSAMPLES_PROMETHEUS_HTTP_HOSTPORT;
433442
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
434443
}
435444
prometheusDomainRegexValue = prometheusRegexValue;

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@
3636

3737
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_STATUS_CONDITION_FAILED_TYPE;
3838
import static oracle.weblogic.kubernetes.TestConstants.GRAFANA_CHART_VERSION;
39-
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
39+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSIDECAR_ALERT_HTTP_NODEPORT;
40+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSIDECAR_PROMETHEUS_HTTP_HOSTPORT;
41+
import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERSIDECAR_PROMETHEUS_HTTP_NODEPORT;
4042
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
43+
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
4144
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
4245
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4346
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
4447
import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CHART_VERSION;
4548
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
4649
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
50+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
51+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
4752
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
4853
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
4954
import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolume;
@@ -471,11 +476,18 @@ private void installPrometheusGrafana(String promChartVersion,
471476
cleanupPromGrafanaClusterRoles(prometheusReleaseName,grafanaReleaseName);
472477
String promHelmValuesFileDir = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(),
473478
"prometheus" + releaseSuffix).toString();
474-
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
475-
monitoringNS,
476-
promChartVersion,
477-
prometheusRegexValue,
478-
promHelmValuesFileDir);
479+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
480+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
481+
monitoringNS,
482+
promChartVersion,
483+
prometheusRegexValue, promHelmValuesFileDir, null,
484+
IT_MONITORINGEXPORTERSIDECAR_PROMETHEUS_HTTP_NODEPORT, IT_MONITORINGEXPORTERSIDECAR_ALERT_HTTP_NODEPORT);
485+
} else {
486+
promHelmParams = installAndVerifyPrometheus(releaseSuffix,
487+
monitoringNS,
488+
promChartVersion,
489+
prometheusRegexValue, promHelmValuesFileDir);
490+
}
479491
assertNotNull(promHelmParams, " Failed to install prometheus");
480492
String command1 = KUBERNETES_CLI + " get svc -n " + monitoringNS;
481493
assertDoesNotThrow(() -> ExecCommand.exec(command1,true));
@@ -489,10 +501,9 @@ private void installPrometheusGrafana(String promChartVersion,
489501
if (!OKE_CLUSTER_PRIVATEIP) {
490502
nodeportPrometheus = promHelmParams.getNodePortServer();
491503
String host = formatIPv6Host(K8S_NODEPORT_HOST);
492-
if (TestConstants.KIND_CLUSTER
493-
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
504+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
494505
host = formatIPv6Host(InetAddress.getLocalHost().getHostAddress());
495-
nodeportPrometheus = IT_MONITORINGEXPORTER_PROMETHEUS_HTTP_HOSTPORT;
506+
nodeportPrometheus = IT_MONITORINGEXPORTERSIDECAR_PROMETHEUS_HTTP_HOSTPORT;
496507
logger.info("Running in podman Debug 1 : {0}", hostPortPrometheus);
497508
}
498509
hostPortPrometheus = host + ":" + nodeportPrometheus;

0 commit comments

Comments
 (0)