Skip to content

Commit 779861c

Browse files
committed
moved coordinator generated deployment to exporter samples dir
1 parent a37109c commit 779861c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITMonitoringExporter.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ public void test03_AppendConfiguration() throws Exception {
207207
assertTrue(page.asText().contains("WebAppComponentRuntime"));
208208
// check previous config is there
209209
assertTrue(page.asText().contains("JVMRuntime"));
210-
// due coordinator bug just checking one of servers
211210
assertTrue(
212211
checkMetricsViaPrometheus(
213212
prometheusSearchKey1, "\"weblogic_serverName\":\"managed-server1\"")
@@ -778,7 +777,7 @@ private static void deployMonitoringExporterPrometethusGrafana(
778777
StringBuffer deployCoordinatorImage = new StringBuffer();
779778
deployCoordinatorImage
780779
.append(" kubectl create -f ")
781-
.append(resourceExporterDir + "/coordinator_" + domainNS + ".yaml ");
780+
.append(samplesDir + "/coordinator_" + domainNS + ".yaml ");
782781
TestUtils.exec(deployCoordinatorImage.toString());
783782

784783
crdCmd = " kubectl apply -f " + samplesDir + "grafana-deployment.yaml";
@@ -795,10 +794,9 @@ private static void deployMonitoringExporterPrometethusGrafana(
795794
* @throws IOException when copying files from source location to staging area fails
796795
*/
797796
private static void createCoordinatorFile(String domainNS) throws IOException {
798-
// String coordinatorDir = BaseTest.getProjectRoot() +
799-
// "/integration-tests/src/test/resources/exporter/";
797+
String samplesDir = monitoringExporterDir + "/src/samples/kubernetes/";
800798
Path src = Paths.get(resourceExporterDir + "/coordinator.yml");
801-
Path dst = Paths.get(resourceExporterDir + "/coordinator_" + domainNS + ".yaml");
799+
Path dst = Paths.get(samplesDir + "/coordinator_" + domainNS + ".yaml");
802800
if (!dst.toFile().exists()) {
803801
logger.log(Level.INFO, "Copying {0}", src.toString());
804802
Charset charset = StandardCharsets.UTF_8;

0 commit comments

Comments
 (0)