(camel) branch main updated: [CAMEL-21349] Add support for camel spring-boot on OpenShift (#15959)

[davsclaus]

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


The following commit(s) were added to refs/heads/main by this push:
     new eeb592348ba [CAMEL-21349] Add support for camel spring-boot on 
OpenShift (#15959)
eeb592348ba is described below

commit eeb592348ba5d66cf156364f15d7e1c5b8b92731
Author: Thomas Diesler <tdies...@redhat.com>
AuthorDate: Tue Oct 15 14:41:57 2024 +0200

    [CAMEL-21349] Add support for camel spring-boot on OpenShift (#15959)
---
 .../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 74d0b0601bd..fc551220dc1 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;
 
@@ -184,11 +185,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 = context.replaceFirst("\\{\\{ \\.ProjectBuildOutputTimestamp 
}}", this.getBuildMavenProjectDate());
 
         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 04b9a488249..5eadff113ba 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));