You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/11 12:57:51 UTC
[camel] 02/02: CAMEL-19599: camel-jbang - Export to camel-main - Add support for Kubernetes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6b8677670bf21090085726815e7af56282e33d00
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jul 11 12:13:43 2023 +0200
CAMEL-19599: camel-jbang - Export to camel-main - Add support for Kubernetes
---
.../org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 5 +++--
.../src/main/resources/templates/main-kubernetes-pom.tmpl | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index a107fe7cda4..54cc96a053e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -269,6 +269,7 @@ class ExportCamelMain extends Export {
InputStream is = ExportCamelMain.class.getClassLoader().getResourceAsStream("templates/main-kubernetes-pom.tmpl");
String context2 = IOHelper.loadText(is);
+ IOHelper.close(is);
int port = httpServerPort(settings);
if (port == -1) {
port = 8080;
@@ -276,8 +277,8 @@ class ExportCamelMain extends Export {
sb2.append(context2.replaceFirst("\\{\\{ \\.Port }}", String.valueOf(port)));
}
- context = context.replaceFirst("\\{\\{ \\.CamelKubernetesProperties }}", sb1.toString());
- context = context.replaceFirst("\\{\\{ \\.CamelKubernetesPlugins }}", sb2.toString());
+ context = context.replace("{{ .CamelKubernetesProperties }}", sb1.toString());
+ context = context.replace("{{ .CamelKubernetesPlugins }}", sb2.toString());
return context;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
index 211e9881b8c..ac6a1e70f91 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
@@ -5,7 +5,7 @@
<configuration>
<container>
<ports>
- <port>{{ .Port}}</port>
+ <port>{{ .Port }}</port>
</ports>
</container>
<containerizingMode>packaged</containerizingMode>