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 2023/05/03 14:25:04 UTC
[camel-karavan] 02/02: Fix #755
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 a9837014e43de7059e28d27cb99461b05521aa7e
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed May 3 10:24:51 2023 -0400
Fix #755
---
.../main/java/org/apache/camel/karavan/api/KubernetesResource.java | 5 ++---
.../java/org/apache/camel/karavan/service/KubernetesService.java | 1 +
karavan-app/src/main/webui/src/projects/ProjectStatus.tsx | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java
index fee4841c..334953f3 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java
@@ -57,10 +57,9 @@ public class KubernetesResource {
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/pipeline/{env}")
- public Project createPipeline(@PathParam("env") String env, Project project) throws Exception {
+ public String createPipeline(@PathParam("env") String env, Project project) throws Exception {
Project p = infinispanService.getProject(project.getProjectId());
- kubernetesService.createPipelineRun(project);
- return p;
+ return kubernetesService.createPipelineRun(project);
}
@GET
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index 7bbac8ea..9fc8499e 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -222,6 +222,7 @@ public class KubernetesService implements HealthCheck{
getTaskRuns(pipelineRunName, namespace).forEach(taskRun -> {
taskRun.getStatus().setConditions(getCancelConditions("TaskRunCancelled"));
+ kubernetesClient().pods().inNamespace(getNamespace()).withName(taskRun.getStatus().getPodName()).delete();
tektonClient().v1beta1().taskRuns().inNamespace(namespace).resource(taskRun).replaceStatus();
});
diff --git a/karavan-app/src/main/webui/src/projects/ProjectStatus.tsx b/karavan-app/src/main/webui/src/projects/ProjectStatus.tsx
index a7c35ff2..0274cb65 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectStatus.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectStatus.tsx
@@ -107,6 +107,7 @@ export class ProjectStatus extends React.Component<Props, State> {
KaravanApi.pipelineRun(this.props.project, this.props.env, res => {
if (res.status === 200 || res.status === 201) {
this.setState({isBuilding: false});
+ ProjectEventBus.showLog('pipeline', res.data, this.props.env)
} else {
// Todo notification
}