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 2024/10/16 10:11:35 UTC
(camel) branch camel-4.8.x updated: [CAMEL-21349] Add support for camel spring-boot on OpenShift (#15976)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.8.x by this push:
new fa74c203e02 [CAMEL-21349] Add support for camel spring-boot on OpenShift (#15976)
fa74c203e02 is described below
commit fa74c203e02ea37c7143c2aefae8ece91523a2e0
Author: Thomas Diesler <td...@redhat.com>
AuthorDate: Wed Oct 16 12:11:29 2024 +0200
[CAMEL-21349] Add support for camel spring-boot on OpenShift (#15976)
---
.../apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 8 +++-----
.../src/main/resources/templates/main-kubernetes-pom.tmpl | 2 +-
.../src/main/resources/templates/spring-boot-kubernetes-pom.tmpl | 2 +-
.../dsl/jbang/core/commands/kubernetes/KubernetesExport.java | 5 +++++
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index aaade9beaa2..84776b519ee 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
@@ -180,11 +181,8 @@ class ExportSpringBoot extends Export {
context = context.replaceAll("\\{\\{ \\.SpringBootVersion }}", springBootVersion);
context = context.replaceAll("\\{\\{ \\.JavaVersion }}", javaVersion);
context = context.replaceAll("\\{\\{ \\.CamelVersion }}", camelVersion);
- if (camelSpringBootVersion != null) {
- context = context.replaceAll("\\{\\{ \\.CamelSpringBootVersion }}", camelSpringBootVersion);
- } else {
- context = context.replaceAll("\\{\\{ \\.CamelSpringBootVersion }}", camelVersion);
- }
+ context = context.replaceAll("\\{\\{ \\.CamelSpringBootVersion }}",
+ Objects.requireNonNullElseGet(camelSpringBootVersion, () -> camelVersion));
context = replaceBuildProperties(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 261ca1ca492..9939cd069e8 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
@@ -125,7 +125,7 @@
</plugin>
<plugin>
<groupId>org.eclipse.jkube</groupId>
- <artifactId>kubernetes-maven-plugin</artifactId>
+ <artifactId>${camel.main.jkube.maven.plugin}</artifactId>
<version>${camel.main.jkube.version}</version>
<configuration>
<imagePullPolicy>${camel.main.kubernetes.image-pull-policy}</imagePullPolicy>
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl
index 0e78042da69..cc7e3572ae7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl
@@ -76,7 +76,7 @@
</plugin>
<plugin>
<groupId>org.eclipse.jkube</groupId>
- <artifactId>kubernetes-maven-plugin</artifactId>
+ <artifactId>${camel.springboot.jkube.maven.plugin}</artifactId>
<version>${camel.springboot.jkube.version}</version>
<configuration>
<imagePullPolicy>${camel.springboot.kubernetes.image-pull-policy}</imagePullPolicy>
diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
index 87888b25d3e..a09f8ac61ca 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
+++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
@@ -332,6 +332,11 @@ public class KubernetesExport extends Export {
// SpringBoot Runtime specific
if (runtime == RuntimeType.springBoot || runtime == RuntimeType.main) {
+ if (ClusterType.OPENSHIFT.isEqualTo(clusterType)) {
+ buildProperties.add("%s.jkube.maven.plugin=%s".formatted(propPrefix, "openshift-maven-plugin"));
+ } else {
+ buildProperties.add("%s.jkube.maven.plugin=%s".formatted(propPrefix, "kubernetes-maven-plugin"));
+ }
File settings = new File(CommandLineHelper.getWorkDir(), Run.RUN_SETTINGS_FILE);
var jkubeVersion = jkubeMavenPluginVersion(settings, mapBuildProperties());
buildProperties.add("%s.jkube.version=%s".formatted(propPrefix, jkubeVersion));