Skip to content

Commit de6a299

Browse files
committed
Merge branch 'elk-fluentd-nightly-fix-r4' into 'release/4.0'
backport the fix for Fluentd failure on nightly(OWLS-109160) to release/4.0 See merge request weblogic-cloud/weblogic-kubernetes-operator!4300
2 parents f222b4c + 520b6a4 commit de6a299

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public static void init(@Namespaces(3) List<String> namespaces) {
182182
installAndVerifyOperator(opNamespace, opNamespace + "-sa",
183183
false, 0, true, domainNamespace);
184184

185-
elasticSearchHost = "elasticsearch." + elasticSearchNs + ".svc.cluster.local";
185+
elasticSearchHost = "elasticsearch." + elasticSearchNs + ".svc";
186186

187187
// upgrade to latest operator
188188
HelmParams upgradeHelmParams = new HelmParams()

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/LoggingExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ private static V1Service createKibanaServiceCr(LoggingExporterParams params) {
468468

469469
private static String execLoggingExpStatusCheck(String opNamespace, String esNamespace,
470470
String labelSelector, String indexRegex) {
471-
String elasticSearchHost = "elasticsearch." + esNamespace + ".svc.cluster.local";
471+
String elasticSearchHost = "elasticsearch." + esNamespace + ".svc";
472472
StringBuffer k8sExecCmdPrefixBuff = new StringBuffer("curl http://");
473473
String cmd = k8sExecCmdPrefixBuff
474474
.append(elasticSearchHost)

0 commit comments

Comments
 (0)