(camel) branch main updated: CAMEL-21486: camel-jbang - cannot push to image-registry.openshift-image-registry.svc:5000 (#16398)

[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 e4826effe26 CAMEL-21486: camel-jbang - cannot push to 
image-registry.openshift-image-registry.svc:5000 (#16398)
e4826effe26 is described below

commit e4826effe2692f6c3043aad63ed47cd52f4d0fe6
Author: Thomas Diesler <tdies...@redhat.com>
AuthorDate: Thu Nov 28 18:09:42 2024 +0100

    CAMEL-21486: camel-jbang - cannot push to 
image-registry.openshift-image-registry.svc:5000 (#16398)
---
 .../core/commands/kubernetes/KubernetesExport.java | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

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 1584e09a29d..ab0eed087da 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
@@ -279,23 +279,31 @@ public class KubernetesExport extends Export {
             
buildProperties.add("jkube.container-image.imagePullPolicy=%s".formatted(imagePullPolicy));
         }
 
+        var skipPush = !container.getImagePush();
+        if (ClusterType.OPENSHIFT.isEqualTo(clusterType)) {
+            if (!"docker".equals(imageBuilder)) {
+                printer().printf("OpenShift forcing --image-builder=docker%n");
+                imageBuilder = "docker";
+            }
+            if (skipPush) {
+                printer().printf("OpenShift forcing --trait 
container.image-push=true%n");
+                container.setImagePush(true);
+            }
+            
buildProperties.add("jkube.maven.plugin=%s".formatted("openshift-maven-plugin"));
+        } else {
+            
buildProperties.add("jkube.maven.plugin=%s".formatted("kubernetes-maven-plugin"));
+        }
+
         if ("docker".equals(imageBuilder) || "jib".equals(imageBuilder)) {
             
buildProperties.add("jkube.build.strategy=%s".formatted(imageBuilder));
         }
-        var skipPush = !container.getImagePush();
         buildProperties.add("jkube.skip.push=%b".formatted(skipPush));
 
         // Runtime specific for Main
         if (runtime == RuntimeType.main) {
-            addDependencies("org.apache.camel:camel-health",
-                    "org.apache.camel:camel-platform-http-main");
+            addDependencies("org.apache.camel:camel-health", 
"org.apache.camel:camel-platform-http-main");
         }
 
-        if (ClusterType.OPENSHIFT.isEqualTo(clusterType)) {
-            
buildProperties.add("jkube.maven.plugin=%s".formatted("openshift-maven-plugin"));
-        } else {
-            
buildProperties.add("jkube.maven.plugin=%s".formatted("kubernetes-maven-plugin"));
-        }
         File settings = new File(CommandLineHelper.getWorkDir(), 
Run.RUN_SETTINGS_FILE);
         var jkubeVersion = jkubeMavenPluginVersion(settings, 
mapBuildProperties());
         buildProperties.add("jkube.version=%s".formatted(jkubeVersion));