[camel-karavan] branch main updated: First prototype for #804

[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 4858dc53 First prototype for #804
4858dc53 is described below

commit 4858dc53464019577315a786edda6efc8327fc60
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Wed Jun 21 10:08:02 2023 -0400

    First prototype for #804
---
 .../main/java/org/apache/camel/karavan/service/KubernetesService.java  | 2 +-
 karavan-cli/pom.xml                                                    | 3 +++
 .../java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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 50c0fb3d..2e5d8c53 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
@@ -460,7 +460,7 @@ public class KubernetesService implements HealthCheck{
                 .withVolumes(
                         new VolumeBuilder().withName("maven-settings")
                                 .withConfigMap(new 
ConfigMapVolumeSourceBuilder()
-                                        
.withName("maven-settings").build()).build())
+                                        .withName("karavan").build()).build())
                 .build();
 
         return new PodBuilder()
diff --git a/karavan-cli/pom.xml b/karavan-cli/pom.xml
index ec4a662f..267b0b4d 100644
--- a/karavan-cli/pom.xml
+++ b/karavan-cli/pom.xml
@@ -77,6 +77,9 @@
                     <transformers>
                         <transformer 
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             
<mainClass>org.apache.camel.karavan.cli.KaravanCli</mainClass>
+                            <manifestEntries>
+                                <Multi-Release>true</Multi-Release>
+                            </manifestEntries>
                         </transformer>
                     </transformers>
                 </configuration>
diff --git 
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
 
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
index 83e8aab6..94791761 100644
--- 
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
+++ 
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
@@ -52,7 +52,7 @@ public class KaravanConfigMap {
             return new BufferedReader(new InputStreamReader(inputStream))
                     .lines()
                     .map(s -> {
-                        if (config.isNexusProxy() && 
s.contains("<url>http://nexus.karavan/</url>")) {
+                        if (config.isNexusProxy() && s.contains(MAVEN_URL)) {
                             String newMavenUrl = "<url>http://nexus."; + 
config.getNamespace() + "/</url>";
                             return s.replace(MAVEN_URL, newMavenUrl);
                         } else {