Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although there is a combined /observe/health, the /observe/health/liveness and /observe/health/readiness are still the way to check the probes. From a camel-jbang kubernetes perspective to monitor the container probes, those are the correct probes paths.
I'm fixing the code/tests for the probe fix and will open a PR shortly.


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`.
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ protected static String jkubeMavenPluginVersion(Path settings, Properties props)
// 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void shouldGenerateProjectWithJib(RuntimeType rt) throws Exception {
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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public void shouldGenerateKubernetesManifest(RuntimeType rt) throws Exception {
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());
}
Expand Down