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 5741f6c5 Fix #977
5741f6c5 is described below
commit 5741f6c539ec18c263c23558956947e964e8d430
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Thu Nov 2 15:03:11 2023 -0400
Fix #977
---
.../src/main/java/org/apache/camel/karavan/code/CodeService.java | 9 ++++-----
.../main/java/org/apache/camel/karavan/service/CamelService.java | 4 +---
.../java/org/apache/camel/karavan/service/ProjectService.java | 4 +---
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index 19de51cb..0877c3a2 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -46,9 +46,6 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
@@ -61,7 +58,8 @@ public class CodeService {
public static final String BUILD_SCRIPT_FILENAME = "build.sh";
public static final String DEV_SERVICES_FILENAME = "devservices.yaml";
public static final String PROJECT_COMPOSE_FILENAME =
"docker-compose.yaml";
- public static final String PROJECT_DEPLOYMENT_JKUBE_FILENAME =
"deployment.jkube.yaml";
+ public static final String PROJECT_JKUBE_EXTENSION = ".jkube.yaml";
+ public static final String PROJECT_DEPLOYMENT_JKUBE_FILENAME =
"deployment" + PROJECT_JKUBE_EXTENSION;
private static final String SNIPPETS_PATH = "/snippets/";
private static final int INTERNAL_PORT = 8080;
@@ -90,9 +88,10 @@ public class CodeService {
"limits.cpu", "2000m"
);
- public Map<String, String> getProjectFiles(String projectId, Boolean
withKamelets) {
+ public Map<String, String> getProjectFilesForDevMode(String projectId,
Boolean withKamelets) {
Map<String, String> files =
infinispanService.getProjectFiles(projectId).stream()
.filter(f -> !Objects.equals(f.getName(),
PROJECT_COMPOSE_FILENAME))
+ .filter(f -> !f.getName().endsWith(PROJECT_JKUBE_EXTENSION))
.collect(Collectors.toMap(ProjectFile::getName,
ProjectFile::getCode));
if (withKamelets) {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
index e5c255d7..9a1ce605 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
@@ -29,11 +29,9 @@ import org.apache.camel.karavan.infinispan.InfinispanService;
import org.apache.camel.karavan.infinispan.model.CamelStatus;
import org.apache.camel.karavan.infinispan.model.CamelStatusValue;
import org.apache.camel.karavan.infinispan.model.ContainerStatus;
-import org.apache.camel.karavan.infinispan.model.ProjectFile;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.faulttolerance.CircuitBreaker;
-import org.eclipse.microprofile.faulttolerance.Retry;
import org.jboss.logging.Logger;
import jakarta.enterprise.context.ApplicationScoped;
@@ -99,7 +97,7 @@ public class CamelService {
public void reloadProjectCode(String projectId) {
LOGGER.info("Reload project code " + projectId);
try {
- Map<String, String> files = codeService.getProjectFiles(projectId,
true);
+ Map<String, String> files =
codeService.getProjectFilesForDevMode(projectId, true);
files.forEach((name, code) -> putRequest(projectId, name, code,
1000));
reloadRequest(projectId);
ContainerStatus containerStatus =
infinispanService.getDevModeContainerStatus(projectId, environment);
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index 314a7f72..7ed2c1cc 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -23,7 +23,6 @@ import org.apache.camel.karavan.code.DockerComposeConverter;
import org.apache.camel.karavan.docker.DockerForKaravan;
import org.apache.camel.karavan.code.model.DockerComposeService;
import org.apache.camel.karavan.git.GitService;
-import org.apache.camel.karavan.git.model.GitConfig;
import org.apache.camel.karavan.git.model.GitRepo;
import org.apache.camel.karavan.infinispan.InfinispanService;
import org.apache.camel.karavan.infinispan.model.*;
@@ -40,7 +39,6 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
-import java.io.File;
import java.time.Instant;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -106,7 +104,7 @@ public class ProjectService implements HealthCheck {
if (ConfigService.inKubernetes()) {
kubernetesService.runDevModeContainer(project, jBangOptions);
} else {
- Map<String, String> files =
codeService.getProjectFiles(project.getProjectId(), true);
+ Map<String, String> files =
codeService.getProjectFilesForDevMode(project.getProjectId(), true);
ProjectFile compose =
infinispanService.getProjectFile(project.getProjectId(),
PROJECT_COMPOSE_FILENAME);
DockerComposeService dcs =
DockerComposeConverter.fromCode(compose.getCode(), project.getProjectId());
