You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/10/28 23:57:33 UTC
[camel-karavan] branch main updated (e0faf04 -> d1e17d5)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from e0faf04 Fix build error
new 850172f Set internal cluster address
new f69721f Pod status test demo
new d1e17d5 Fix project deployment mapping in Dashboard
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/karavan/informer/PodEventHandler.java | 11 +++++++----
.../java/org/apache/camel/karavan/service/StatusService.java | 2 +-
karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
[camel-karavan] 03/03: Fix project deployment mapping in Dashboard
Posted by ma...@apache.org.
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
commit d1e17d59c924af79cf762bfb0b897555dd0c52c1
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Oct 28 19:57:25 2022 -0400
Fix project deployment mapping in Dashboard
---
karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx b/karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx
index a682fd0..6eafbc7 100644
--- a/karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx
+++ b/karavan-app/src/main/webapp/src/dashboard/DashboardPage.tsx
@@ -159,11 +159,11 @@ export class DashboardPage extends React.Component<Props, State> {
}
getProject(name: string): Project | undefined {
- return this.state.projects.filter(p => p.name === name)?.at(0);
+ return this.state.projects.filter(p => p.projectId === name)?.at(0);
}
isKaravan(name: string): boolean {
- return this.state.projects.findIndex(p => p.projectId === name) > 0;
+ return this.state.projects.findIndex(p => p.projectId === name) > -1;
}
getReplicasPanel(deploymentStatus?: DeploymentStatus) {
[camel-karavan] 01/03: Set internal cluster address
Posted by ma...@apache.org.
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
commit 850172fbdff917f4c821bf6a3e2de6f818b2a344
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Oct 28 19:51:14 2022 -0400
Set internal cluster address
---
.../src/main/java/org/apache/camel/karavan/service/StatusService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 8720539..35eb10e 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
@@ -74,7 +74,7 @@ public class StatusService {
private void collectStatusesForProject(String 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(), kubernetesService.getCluster());
+ : String.format("http://%s.%s.%s/q/health", projectId, kubernetesService.getNamespace(), "svc.cluster.local");
CamelStatus cs = getCamelStatus(projectId, url);
infinispanService.saveCamelStatus(cs);
}
[camel-karavan] 02/03: Pod status test demo
Posted by ma...@apache.org.
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
commit f69721ffea962c314684df1be2e4e8b6604e5874
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Oct 28 19:54:12 2022 -0400
Pod status test demo
---
.../org/apache/camel/karavan/informer/PodEventHandler.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
index 4e68379..440d154 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
@@ -4,6 +4,7 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodCondition;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import org.apache.camel.karavan.model.PodStatus;
+import org.apache.camel.karavan.model.ServiceStatus;
import org.apache.camel.karavan.service.InfinispanService;
import org.apache.camel.karavan.service.KubernetesService;
import org.jboss.logging.Logger;
@@ -28,8 +29,9 @@ public class PodEventHandler implements ResourceEventHandler<Pod> {
PodStatus ps = getPodStatus(pod);
infinispanService.savePodStatus(ps);
// TODO: Delete after UI design
- ps.setEnv("test");
- infinispanService.savePodStatus(ps);
+ PodStatus ds1 = getPodStatus(pod);
+ ds1.setEnv("test");
+ infinispanService.savePodStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}
@@ -42,8 +44,9 @@ public class PodEventHandler implements ResourceEventHandler<Pod> {
PodStatus ps = getPodStatus(newPod);
infinispanService.savePodStatus(ps);
// TODO: Delete after UI design
- ps.setEnv("test");
- infinispanService.savePodStatus(ps);
+ PodStatus ds1 = getPodStatus(newPod);
+ ds1.setEnv("test");
+ infinispanService.savePodStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}