[camel-karavan] branch main updated: Prepare to work in Openshift for #885

[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 c80f0747 Prepare to work in Openshift for #885
c80f0747 is described below

commit c80f07477e08be3b2e4e1ccd2124282b81c20b9c
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Sun Sep 17 15:28:26 2023 -0400

    Prepare to work in Openshift for #885
---
 .../src/main/java/org/apache/camel/karavan/code/CodeService.java    | 6 ++++++
 .../main/java/org/apache/camel/karavan/service/ProjectService.java  | 3 +++
 2 files changed, 9 insertions(+)

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 33e771e0..d28af85b 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
@@ -58,6 +58,7 @@ 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";
     private static final String SNIPPETS_PATH = "/snippets/";
     private static final int INTERNAL_PORT = 8080;
 
@@ -245,6 +246,11 @@ public class CodeService {
         return new ProjectFile(PROJECT_COMPOSE_FILENAME, code, 
project.getProjectId(), Instant.now().toEpochMilli());
     }
 
+    public ProjectFile createInitialDeployment(Project project) {
+        String template = getTemplateText(PROJECT_DEPLOYMENT_JKUBE_FILENAME);
+        return new ProjectFile(PROJECT_DEPLOYMENT_JKUBE_FILENAME, template, 
project.getProjectId(), Instant.now().toEpochMilli());
+    }
+
     private int getNextAvailablePort() {
         int dockerPort = dockerService.getMaxPortMapped(INTERNAL_PORT);
         int projectPort = getMaxPortMappedInProjects();
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 7b840e2b..69c7e65a 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
@@ -180,6 +180,9 @@ public class ProjectService implements HealthCheck {
             if (!ConfigService.inKubernetes()) {
                 ProjectFile projectCompose = 
codeService.createInitialProjectCompose(project);
                 infinispanService.saveProjectFile(projectCompose);
+            } else if (kubernetesService.isOpenshift()){
+                ProjectFile projectCompose = 
codeService.createInitialDeployment(project);
+                infinispanService.saveProjectFile(projectCompose);
             }
         }
         return project;