[camel-karavan] branch main updated: DevMode #855

[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 c79f4b47 DevMode #855
c79f4b47 is described below

commit c79f4b47516a2cec18aef51d7e7edaf4b6653ed2
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Thu Aug 10 09:35:43 2023 -0400

    DevMode #855
---
 .github/workflows/docker-devmode.yml                               | 6 +++---
 karavan-web/docker/{Dockerfile.runner => Dockerfile.devmode}       | 2 +-
 .../org/apache/camel/karavan/kubernetes/KubernetesService.java     | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-devmode.yml 
b/.github/workflows/docker-devmode.yml
index 35a7b030..932d4974 100644
--- a/.github/workflows/docker-devmode.yml
+++ b/.github/workflows/docker-devmode.yml
@@ -3,12 +3,12 @@ name: DevMode container image
 on:
   push:
     branches: [ main ]
-    paths: ['karavan-web/docker/Dockerfile.runner']
+    paths: ['karavan-web/docker/Dockerfile.devmode']
   workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}-runner
+  IMAGE_NAME: ${{ github.repository }}-devmode
   TAG: 4.0.0-RC2
 
 jobs:
@@ -31,6 +31,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./karavan-web/docker
-          file: karavan-web/docker/Dockerfile.runner
+          file: karavan-web/docker/Dockerfile.devmode
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
diff --git a/karavan-web/docker/Dockerfile.runner 
b/karavan-web/docker/Dockerfile.devmode
similarity index 93%
rename from karavan-web/docker/Dockerfile.runner
rename to karavan-web/docker/Dockerfile.devmode
index 7b9891e2..1b78b851 100644
--- a/karavan-web/docker/Dockerfile.runner
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:17.0.8_7-jdk
 
 LABEL "org.opencontainers.image.title"="karavan"
-LABEL "org.opencontainers.image.description"="Apache Camel Karavan Builder"
+LABEL "org.opencontainers.image.description"="Apache Camel Karavan DevMode"
 LABEL "org.opencontainers.image.url"="https://camel.apache.org";
 LABEL "org.opencontainers.image.licenses"="Apache 2.0"
 LABEL "org.opencontainers.image.version"="4.0.0-RC2"
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 5352aa7a..f35a510a 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -84,9 +84,6 @@ public class KubernetesService implements HealthCheck {
         return kubernetesClient().adapt(OpenShiftClient.class);
     }
 
-    @ConfigProperty(name = "kubernetes.namespace", defaultValue = 
KARAVAN_PREFIX)
-    String currentNamespace;
-
     @ConfigProperty(name = "karavan.environment")
     public String environment;
 
@@ -446,7 +443,7 @@ public class KubernetesService implements HealthCheck {
 
         Container container = new ContainerBuilder()
                 .withName(name)
-                .withImage("ghcr.io/apache/camel-karavan-runner:" + version)
+                .withImage("ghcr.io/apache/camel-karavan-devmode:" + version)
                 .withPorts(port)
                 .withResources(resources)
                 .withImagePullPolicy("Always")
@@ -548,7 +545,7 @@ public class KubernetesService implements HealthCheck {
     }
 
     public String getNamespace() {
-        return currentNamespace;
+        return kubernetesClient().getNamespace();
     }
 
 }