[camel-karavan] branch main updated: Statuses fix

[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 d5f1f54  Statuses fix
d5f1f54 is described below

commit d5f1f54c3622db33364cda47fc7c018d69ed7944
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Fri Dec 16 17:02:28 2022 -0500

    Statuses fix
---
 .../apache/camel/karavan/informer/DeploymentEventHandler.java    | 2 +-
 .../java/org/apache/camel/karavan/model/DeploymentStatus.java    | 2 +-
 .../java/org/apache/camel/karavan/service/StatusService.java     | 9 ++++++---
 karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx   | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
index 166005e..65d34a7 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
@@ -67,8 +67,8 @@ public class DeploymentEventHandler implements 
ResourceEventHandler<Deployment>
             return new DeploymentStatus(
                     deployment.getMetadata().getName(),
                     deployment.getMetadata().getNamespace(),
-                    kubernetesService.environment,
                     kubernetesService.getCluster(),
+                    kubernetesService.environment,
                     imageName,
                     deployment.getSpec().getReplicas(),
                     deployment.getStatus().getReadyReplicas(),
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
index fe50512..bfeeb43 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
@@ -34,7 +34,7 @@ public class DeploymentStatus {
     }
 
     @ProtoFactory
-    public DeploymentStatus(String name, String namespace, String env, String 
cluster, String image, Integer replicas, Integer readyReplicas, Integer 
unavailableReplicas) {
+    public DeploymentStatus(String name, String namespace, String cluster, 
String env, String image, Integer replicas, Integer readyReplicas, Integer 
unavailableReplicas) {
         this.name = name;
         this.namespace = namespace;
         this.env = env;
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
index 6fb5d1a..47ea8a4 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
@@ -26,6 +26,7 @@ import io.vertx.mutiny.core.eventbus.EventBus;
 import io.vertx.mutiny.ext.web.client.HttpResponse;
 import io.vertx.mutiny.ext.web.client.WebClient;
 import org.apache.camel.karavan.model.CamelStatus;
+import org.apache.camel.karavan.model.Project;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
@@ -103,9 +104,11 @@ public class StatusService {
 
     private void collectStatusesForProject(String projectId) {
         LOGGER.info("Collect Camel status for project " + projectId);
-        String url = ProfileManager.getActiveProfile().equals("dev")
-                ? String.format("http://%s-%s.%s/q/health";, projectId, 
kubernetesService.getNamespace(), kubernetesService.getCluster())
-                : String.format("http://%s.%s.%s/q/health";, projectId, 
kubernetesService.getNamespace(), "svc.cluster.local");
+        Project project = infinispanService.getProject(projectId);
+        String path = project.getRuntime().equalsIgnoreCase("quarkus") ? 
"/q/health" : "/actuator/health";
+        String separator = ProfileManager.getActiveProfile().equals("dev") ? 
"." : "-";
+        String cluster = ProfileManager.getActiveProfile().equals("dev") ? 
kubernetesService.getCluster() : "svc.cluster.local";
+        String url = "http://"; + projectId + separator + 
kubernetesService.getNamespace() + "." + cluster + path;
         CamelStatus cs = getCamelStatus(projectId, url);
         try {
             String data = mapper.writeValueAsString(cs);
diff --git a/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx 
b/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx
index 6314a50..00816dc 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx
@@ -50,7 +50,6 @@ export class ProjectPageToolbar extends 
React.Component<Props> {
     push = (after?: () => void) => {
         this.setState({isPushing: true});
         KaravanApi.push(this.props.project, res => {
-            console.log(res)
             if (res.status === 200 || res.status === 201) {
                 this.setState({isPushing: false});
                 after?.call(this);