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 972bfc8e39b0 CAMEL-22982: Upgrade jkube 1.19.0 (#21407)
972bfc8e39b0 is described below
commit 972bfc8e39b0c5b026de7b2e59e6896805b9f70f
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 12 10:31:01 2026 +0100
CAMEL-22982: Upgrade jkube 1.19.0 (#21407)
* CAMEL-22982: Upgrade jkube 1.19.0
---
.../camel/catalog/jbang/camel-jbang-configuration-metadata.json | 2 +-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 7 +++++++
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 2 +-
.../resources/META-INF/camel-jbang-configuration-metadata.json | 2 +-
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../apache/camel/dsl/jbang/core/common/CamelJBangConstants.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java | 2 +-
.../src/test/resources/application-jkube.properties | 2 +-
.../dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java | 4 ++--
9 files changed, 16 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json
index c230d7b16bb5..22ca438bb84d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json
@@ -25,7 +25,7 @@
{ "name": "camel.jbang.jfr", "required": false, "description": "Enables
Java Flight Recorder saving recording to disk on exit", "type": "boolean",
"javaType": "boolean", "defaultValue": false, "secret": false },
{ "name": "camel.jbang.jfr-profile", "required": false, "description":
"Java Flight Recorder profile to use (such as default or profile)", "type":
"string", "javaType": "String", "defaultValue": "default", "secret": false },
{ "name": "camel.jbang.jib-maven-plugin-version", "required": false,
"description": "Version to use for jib-maven-plugin if exporting to camel-main
and have Kubernetes enabled (jkube.xxx options)", "label": "kubernetes",
"type": "string", "javaType": "String", "defaultValue": "3.4.5", "secret":
false },
- { "name": "camel.jbang.jkube-maven-plugin-version", "required": false,
"description": "Version to use for jkube-maven-plugin if exporting to
camel-main and have Kubernetes enabled (jkube.xxx options)", "label":
"kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.18.1",
"secret": false },
+ { "name": "camel.jbang.jkube-maven-plugin-version", "required": false,
"description": "Version to use for jkube-maven-plugin if exporting to
camel-main and have Kubernetes enabled (jkube.xxx options)", "label":
"kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.19.0",
"secret": false },
{ "name": "camel.jbang.jkubeFiles", "required": false, "description":
"Resource YAML fragments for Kubernetes using Eclipse JKube tool (Use commas to
separate multiple files).", "label": "kubernetes", "type": "string",
"javaType": "String", "secret": false },
{ "name": "camel.jbang.kameletsVersion", "required": false, "description":
"Apache Camel Kamelets version. By default the Kamelets are the same version as
Camel.", "type": "string", "javaType": "String", "secret": false },
{ "name": "camel.jbang.lazyBean", "required": false, "description":
"Whether to use lazy bean initialization (can help with complex classloading
issues)", "label": "advanced", "type": "boolean", "javaType": "boolean",
"defaultValue": false, "secret": false },
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
index 0e791b5b5122..9cb83ffa87f6 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
@@ -23,6 +23,13 @@ The *simple* language has deprecated binary operators that
uses space in the nam
- `starts with` use `startsWith` instead
- `ends with` use `endsWith` instead
+=== camel-jbang
+
+JKube has been upgraded from 1.8.1 to 1.9.0 which has changed the default path
for
+Spring Boot health checks from `/observe/health/liveness` &
`/observe/health/readiness` to a combined path `/observe/health`.
+
+This can affect users that are using `camel kubernetes export` to export to
Spring Boot applications.
+
=== camel-file
The `org.apache.camel.component.file.GenericFileOperations` has added method
`storeFileDirectly`.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index bfdf1e2fdb04..cb0171670615 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -4168,7 +4168,7 @@ The camel.jbang supports 47 options, which are listed
below.
| *camel.jbang.jfr* | Enables Java Flight Recorder saving recording to disk on
exit | false | boolean
| *camel.jbang.jfr-profile* | Java Flight Recorder profile to use (such as
default or profile) | default | String
| *camel.jbang.jib-maven-plugin-version* | Version to use for jib-maven-plugin
if exporting to camel-main and have Kubernetes enabled (jkube.xxx options) |
3.4.5 | String
-| *camel.jbang.jkube-maven-plugin-version* | Version to use for
jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled
(jkube.xxx options) | 1.18.1 | String
+| *camel.jbang.jkube-maven-plugin-version* | Version to use for
jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled
(jkube.xxx options) | 1.19.0 | String
| *camel.jbang.jkubeFiles* | Resource YAML fragments for Kubernetes using
Eclipse JKube tool (Use commas to separate multiple files). | | String
| *camel.jbang.kameletsVersion* | Apache Camel Kamelets version. By default
the Kamelets are the same version as Camel. | | String
| *camel.jbang.lazyBean* | Whether to use lazy bean initialization (can help
with complex classloading issues) | false | boolean
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json
index c230d7b16bb5..22ca438bb84d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json
+++
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json
@@ -25,7 +25,7 @@
{ "name": "camel.jbang.jfr", "required": false, "description": "Enables
Java Flight Recorder saving recording to disk on exit", "type": "boolean",
"javaType": "boolean", "defaultValue": false, "secret": false },
{ "name": "camel.jbang.jfr-profile", "required": false, "description":
"Java Flight Recorder profile to use (such as default or profile)", "type":
"string", "javaType": "String", "defaultValue": "default", "secret": false },
{ "name": "camel.jbang.jib-maven-plugin-version", "required": false,
"description": "Version to use for jib-maven-plugin if exporting to camel-main
and have Kubernetes enabled (jkube.xxx options)", "label": "kubernetes",
"type": "string", "javaType": "String", "defaultValue": "3.4.5", "secret":
false },
- { "name": "camel.jbang.jkube-maven-plugin-version", "required": false,
"description": "Version to use for jkube-maven-plugin if exporting to
camel-main and have Kubernetes enabled (jkube.xxx options)", "label":
"kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.18.1",
"secret": false },
+ { "name": "camel.jbang.jkube-maven-plugin-version", "required": false,
"description": "Version to use for jkube-maven-plugin if exporting to
camel-main and have Kubernetes enabled (jkube.xxx options)", "label":
"kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.19.0",
"secret": false },
{ "name": "camel.jbang.jkubeFiles", "required": false, "description":
"Resource YAML fragments for Kubernetes using Eclipse JKube tool (Use commas to
separate multiple files).", "label": "kubernetes", "type": "string",
"javaType": "String", "secret": false },
{ "name": "camel.jbang.kameletsVersion", "required": false, "description":
"Apache Camel Kamelets version. By default the Kamelets are the same version as
Camel.", "type": "string", "javaType": "String", "secret": false },
{ "name": "camel.jbang.lazyBean", "required": false, "description":
"Whether to use lazy bean initialization (can help with complex classloading
issues)", "label": "advanced", "type": "boolean", "javaType": "boolean",
"defaultValue": false, "secret": false },
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 49ebb67f2c34..cadd13b095a6 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -1076,7 +1076,7 @@ public abstract class ExportBaseCommand extends
CamelCommand {
// ignore
}
}
- return answer != null ? answer : "1.18.1";
+ return answer != null ? answer : "1.19.0";
}
// This method is kept for backward compatibility with derived classes
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java
index a8da99157d15..0c62a6979f78 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java
@@ -150,7 +150,7 @@ public final class CamelJBangConstants {
public static final String JIB_MAVEN_PLUGIN_VERSION =
"camel.jbang.jib-maven-plugin-version";
@Metadata(description = "Version to use for jkube-maven-plugin if
exporting to camel-main and have Kubernetes enabled (jkube.xxx options)",
- javaType = "String", defaultValue = "1.18.1", label =
"kubernetes")
+ javaType = "String", defaultValue = "1.19.0", label =
"kubernetes")
public static final String JKUBE_MAVEN_PLUGIN_VERSION =
"camel.jbang.jkube-maven-plugin-version";
@Metadata(description = "Stubs all the matching endpoint with the given
component name or pattern. Multiple names can be separated by comma. (all =
everything).",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java
index 5437e612460e..82b0305f2cb8 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java
@@ -89,7 +89,7 @@ class ExportMainJkubeTest {
p = model.getBuild().getPlugins().get(4);
Assertions.assertEquals("org.eclipse.jkube", p.getGroupId());
Assertions.assertEquals("kubernetes-maven-plugin", p.getArtifactId());
- Assertions.assertEquals("1.18.1", p.getVersion());
+ Assertions.assertEquals("1.19.0", p.getVersion());
command.printConfigurationValues("export command");
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties
index 49db81d2e13b..7a9350f3ca22 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
jib.label=abc
label.runtime=camel-main
-jkube.version=1.18.1
+jkube.version=1.19.0
jkube.skip.build=true
jkube.skip.push=true
jkube.imagePullPolicy=Always
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java
index 96dcd56ff601..b61ec98ca3fe 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java
@@ -145,8 +145,8 @@ class KubernetesRunTest extends KubernetesBaseTestSupport {
Assertions.assertEquals(9876,
containers.get(0).getStartupProbe().getHttpGet().getPort().getIntVal());
} else if (RuntimeType.springBoot ==
RuntimeType.fromValue(rt.runtime())) {
// spring-boot doesn't set the startup probe
- Assertions.assertEquals("/observe/health/liveness",
containers.get(0).getLivenessProbe().getHttpGet().getPath());
- Assertions.assertEquals("/observe/health/readiness",
containers.get(0).getReadinessProbe().getHttpGet().getPath());
+ Assertions.assertEquals("/observe/health",
containers.get(0).getLivenessProbe().getHttpGet().getPath());
+ Assertions.assertEquals("/observe/health",
containers.get(0).getReadinessProbe().getHttpGet().getPath());
Assertions.assertEquals(9876,
containers.get(0).getReadinessProbe().getHttpGet().getPort().getIntVal());
Assertions.assertEquals(9876,
containers.get(0).getLivenessProbe().getHttpGet().getPort().getIntVal());
}
