(camel-karavan) branch main updated: Scheduler fixes

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new 8292ed62 Scheduler fixes
8292ed62 is described below

commit 8292ed6228344fe31f6bd7e170a7b93b1fbb36f6
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Nov 1 11:49:30 2024 -0400

    Scheduler fixes
---
 .../karavan/scheduler/CamelStatusScheduler.java    | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
index 552e91a9..5853867f 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/scheduler/CamelStatusScheduler.java
@@ -24,6 +24,7 @@ import jakarta.inject.Inject;
 import org.apache.camel.karavan.KaravanCache;
 import org.apache.camel.karavan.KaravanConstants;
 import org.apache.camel.karavan.model.CamelStatusRequest;
+import org.apache.camel.karavan.service.ConfigService;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
@@ -51,14 +52,25 @@ public class CamelStatusScheduler {
     @Scheduled(every = "{karavan.camel.status.interval}", concurrentExecution 
= Scheduled.ConcurrentExecution.SKIP)
     public void collectCamelStatuses() {
         LOGGER.debug("Collect Camel Statuses");
-        karavanCache.getPodContainerStatuses(environment).stream()
-                .filter(cs -> 
Objects.equals(cs.getLabels().get(LABEL_KUBERNETES_RUNTIME), CAMEL_PREFIX))
-                .filter(cs -> Objects.equals(cs.getCamelRuntime(), 
KaravanConstants.CamelRuntime.CAMEL_MAIN.getValue()))
-                .forEach(cs -> {
-                    CamelStatusRequest csr = new 
CamelStatusRequest(cs.getProjectId(), cs.getContainerName());
-                    eventBus.publish(CMD_COLLECT_CAMEL_STATUS,
-                            JsonObject.mapFrom(Map.of("containerStatus", cs, 
"camelStatusRequest", csr))
-                    );
-                });
+        if (ConfigService.inKubernetes()) {
+            karavanCache.getPodContainerStatuses(environment).stream()
+                    .filter(cs -> 
Objects.equals(cs.getLabels().get(LABEL_KUBERNETES_RUNTIME), CAMEL_PREFIX))
+                    .filter(cs -> Objects.equals(cs.getCamelRuntime(), 
KaravanConstants.CamelRuntime.CAMEL_MAIN.getValue()))
+                    .forEach(cs -> {
+                        CamelStatusRequest csr = new 
CamelStatusRequest(cs.getProjectId(), cs.getContainerName());
+                        eventBus.publish(CMD_COLLECT_CAMEL_STATUS,
+                                JsonObject.mapFrom(Map.of("containerStatus", 
cs, "camelStatusRequest", csr))
+                        );
+                    });
+        } else {
+            karavanCache.getPodContainerStatuses(environment).stream()
+                    .filter(cs -> Objects.equals(cs.getCamelRuntime(), 
KaravanConstants.CamelRuntime.CAMEL_MAIN.getValue()))
+                    .forEach(cs -> {
+                        CamelStatusRequest csr = new 
CamelStatusRequest(cs.getProjectId(), cs.getContainerName());
+                        eventBus.publish(CMD_COLLECT_CAMEL_STATUS,
+                                JsonObject.mapFrom(Map.of("containerStatus", 
cs, "camelStatusRequest", csr))
+                        );
+                    });
+        }
     }
 }
\ No newline at end of file