(camel-karavan) branch main updated: Env variables in devmode pod

[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 e8b353e6 Env variables in devmode pod
e8b353e6 is described below

commit e8b353e6afdbdee0ed815f656fba37e803687ddc
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Feb 3 18:47:17 2025 -0500

    Env variables in devmode pod
---
 .../camel/karavan/kubernetes/KubernetesService.java       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 33d756b1..1bebbe3f 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.karavan.kubernetes;
 
+import org.apache.camel.karavan.model.KubernetesConfigMap;
+import org.apache.camel.karavan.model.KubernetesSecret;
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -30,8 +32,7 @@ import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 import org.apache.camel.karavan.KaravanConstants;
 import org.apache.camel.karavan.model.ContainerType;
-import org.apache.camel.karavan.model.KubernetesConfigMap;
-import org.apache.camel.karavan.model.KubernetesSecret;
+import org.apache.camel.karavan.model.Project;
 import org.apache.camel.karavan.service.CodeService;
 import org.apache.camel.karavan.service.ConfigService;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -421,7 +422,15 @@ public class KubernetesService {
                 .build();
 
         List<EnvVar> environmentVariables = new ArrayList<>();
-        envVars.forEach((k, v) -> environmentVariables.add(new 
EnvVarBuilder().withName(k).withValue(v).build()));
+        try {
+            environmentVariables = new 
ArrayList<>(podSpec.getContainers().get(0).getEnv());
+        } catch (Exception ignored) {}
+
+        for (Map.Entry<String, String> entry : envVars.entrySet()) {
+            String k = entry.getKey();
+            String v = entry.getValue();
+            environmentVariables.add(new 
EnvVarBuilder().withName(k).withValue(v).build());
+        }
         if (verbose) {
             environmentVariables.add(new 
EnvVarBuilder().withName(ENV_VAR_VERBOSE_OPTION_NAME).withValue(ENV_VAR_VERBOSE_OPTION_VALUE).build());
         }