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 520b49baccb1 CAMEL-26934: camel-jbang-plugin-kubernetes - kubernetes
delete deletes the CronJob, cronjob.backoffLimit=0 is kept, and a cronjob
without schedule is a usage error (#30034)
520b49baccb1 is described below
commit 520b49baccb1a63e6f61ffcaabd2c6ca2da7930e
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Nov 15 20:22:29 2026 +0100
CAMEL-26934: camel-jbang-plugin-kubernetes - kubernetes delete deletes the
CronJob, cronjob.backoffLimit=0 is kept, and a cronjob without schedule is a
usage error (#30034)
- camel kubernetes delete deleted the Deployment, Service, ConfigMaps,
Secrets, Ingress and Knative Service of an
integration, never its CronJob.
- cronjob.backoffLimit=0 (no retry of a failed job) was left out, so
Kubernetes retried 6 times.
- cronjob.enabled=true without cronjob.schedule generated no workload at
all and exited with 0; it now exits with 2
and says that a schedule is needed.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../core/commands/kubernetes/KubernetesDelete.java | 6 +++++
.../commands/kubernetes/traits/CronJobTrait.java | 14 +++++++---
.../commands/kubernetes/KubernetesDeleteTest.java | 31 ++++++++++++++++++++++
.../commands/kubernetes/KubernetesExportTest.java | 24 +++++++++++++++++
4 files changed, 71 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
index 66050bb39b4b..a8ae92f903d1 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
@@ -58,6 +58,12 @@ public class KubernetesDelete extends KubernetesBaseCommand {
try {
// delete Deployment cascades to pod
deleteStatuses.addAll(client.apps().deployments().inNamespace(namespace).withLabels(labels).delete());
+ // delete CronJob, which cascades to its jobs and pods
(CAMEL-26934: a CronJob was never deleted)
+ try {
+
deleteStatuses.addAll(client.batch().v1().cronjobs().inNamespace(namespace).withLabels(labels).delete());
+ } catch (Exception ex) {
+ // ignore, as for the ingresses and the Knative services
+ }
// delete service
deleteStatuses.addAll(client.services().inNamespace(namespace).withLabels(labels).delete());
// delete configmap
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/CronJobTrait.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/CronJobTrait.java
index 2ddfc8bd270b..3d629d132f4b 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/CronJobTrait.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/CronJobTrait.java
@@ -24,6 +24,7 @@ import
io.fabric8.kubernetes.api.model.batch.v1.CronJobBuilder;
import
org.apache.camel.dsl.jbang.core.commands.kubernetes.traits.model.Container;
import
org.apache.camel.dsl.jbang.core.commands.kubernetes.traits.model.CronJob;
import org.apache.camel.dsl.jbang.core.commands.kubernetes.traits.model.Traits;
+import org.apache.camel.dsl.jbang.core.common.CliException;
import org.apache.camel.util.ObjectHelper;
public class CronJobTrait extends BaseTrait {
@@ -34,9 +35,13 @@ public class CronJobTrait extends BaseTrait {
@Override
public boolean configure(Traits traitConfig, TraitContext context) {
- return traitConfig.getCronjob() != null
- &&
Optional.ofNullable(traitConfig.getCronjob().getEnabled()).orElse(false)
- &&
ObjectHelper.isNotEmpty(traitConfig.getCronjob().getSchedule());
+ boolean enabled = traitConfig.getCronjob() != null
+ &&
Optional.ofNullable(traitConfig.getCronjob().getEnabled()).orElse(false);
+ if (enabled &&
ObjectHelper.isEmpty(traitConfig.getCronjob().getSchedule())) {
+ // without a schedule there was no workload at all, and the export
exited with 0 (CAMEL-26934)
+ throw CliException.usage("cronjob.enabled=true needs
cronjob.schedule, such as cronjob.schedule=0 * * * *");
+ }
+ return enabled;
}
@Override
@@ -105,7 +110,8 @@ public class CronJobTrait extends BaseTrait {
.withActiveDeadlineSeconds(cronjobTrait.getActiveDeadlineSeconds()).endSpec().endJobTemplate().endSpec();
}
// sets the BackoffLimit
- if (cronjobTrait.getBackoffLimit() != null &&
cronjobTrait.getBackoffLimit() > 0) {
+ // 0 is a limit too: no retry of a failed job (it was left out, and
Kubernetes then retries 6 times)
+ if (cronjobTrait.getBackoffLimit() != null &&
cronjobTrait.getBackoffLimit() >= 0) {
cronjobBuilder.editOrNewSpec().editOrNewJobTemplate().editOrNewSpec()
.withBackoffLimit(cronjobTrait.getBackoffLimit()).endSpec().endJobTemplate().endSpec();
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDeleteTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDeleteTest.java
index 9c40d99a5d44..b3e62c341ea8 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDeleteTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDeleteTest.java
@@ -18,7 +18,10 @@
package org.apache.camel.dsl.jbang.core.commands.kubernetes;
import java.net.HttpURLConnection;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
import io.fabric8.kubernetes.api.model.Node;
import io.fabric8.kubernetes.api.model.NodeBuilder;
@@ -27,6 +30,7 @@ import io.fabric8.kubernetes.api.model.NodeListBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.openshift.api.model.config.v1.ClusterVersion;
import io.fabric8.openshift.api.model.config.v1.ClusterVersionBuilder;
import io.fabric8.openshift.client.OpenShiftClient;
@@ -219,6 +223,33 @@ class KubernetesDeleteTest {
Assertions.assertNull(ocpClient.routes().withName(name).get());
}
+ @Test
+ public void shouldDeleteTheCronJob() throws Exception {
+ // CAMEL-26934: delete never deleted the CronJob of an integration
+ for (String kind :
List.of("/apis/apps/v1/namespaces/test/deployments",
"/apis/batch/v1/namespaces/test/cronjobs",
+ "/api/v1/namespaces/test/services",
"/api/v1/namespaces/test/configmaps",
+ "/api/v1/namespaces/test/secrets")) {
+ serverDeleteExpect(kind +
"?labelSelector=app.kubernetes.io%2Fname%3Dmy-route");
+ }
+ KubernetesDelete command = new KubernetesDelete(new
CamelJBangMain().withPrinter(printer));
+ command.withClient(client);
+ command.namespace = "test";
+ command.name = "my-route";
+ command.doCall();
+
+ List<String> deletes = new ArrayList<>();
+ int requests = server.getRequestCount();
+ for (int i = 0; i < requests; i++) {
+ RecordedRequest request = server.takeRequest(1, TimeUnit.SECONDS);
+ if (request != null && "DELETE".equals(request.getMethod())) {
+ deletes.add(request.getPath());
+ }
+ }
+ Assertions.assertTrue(deletes.contains(
+
"/apis/batch/v1/namespaces/test/cronjobs?labelSelector=app.kubernetes.io%2Fname%3Dmy-route"),
+ deletes.toString());
+ }
+
private void serverDeleteExpect(String path) {
server.expect().delete()
.withPath(path)
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
index ec2a45a5fb29..680a2e7bad1a 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
@@ -36,6 +36,8 @@ import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
import io.fabric8.openshift.api.model.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.dsl.jbang.core.commands.kubernetes.traits.BaseTrait;
+import org.apache.camel.dsl.jbang.core.common.CliException;
+import org.apache.camel.dsl.jbang.core.common.CliExitCode;
import org.apache.camel.dsl.jbang.run.common.RuntimeType;
import org.apache.camel.util.IOHelper;
import org.apache.maven.model.Model;
@@ -248,6 +250,28 @@ class KubernetesExportTest extends
KubernetesExportBaseTestSupport {
Assertions.assertEquals("ops",
cronjob.getMetadata().getAnnotations().get("team"));
}
+ @Test
+ public void aBackoffLimitOfZeroIsKept() throws Exception {
+ // CAMEL-26934: 0 (no retry) was left out, so Kubernetes retried a
failed job 6 times
+ KubernetesExport command = createCommand(new String[] {
"classpath:route.yaml" }, "--runtime=" + RuntimeType.main);
+ command.traits = new String[] { "cronjob.enabled=true",
"cronjob.schedule=\"0 22 * * 1-5\"", "cronjob.backoffLimit=0" };
+ Assertions.assertEquals(0, command.doCall());
+
+ CronJob cronjob = getResource(RuntimeType.main,
CronJob.class).orElseThrow();
+ Assertions.assertEquals(0,
cronjob.getSpec().getJobTemplate().getSpec().getBackoffLimit());
+ }
+
+ @Test
+ public void aCronjobWithoutScheduleIsAUsageError() throws Exception {
+ // CAMEL-26934: there was no workload at all, and the export exited
with 0
+ KubernetesExport command = createCommand(new String[] {
"classpath:route.yaml" }, "--runtime=" + RuntimeType.main);
+ command.traits = new String[] { "cronjob.enabled=true" };
+
+ CliException e = Assertions.assertThrows(CliException.class,
command::doCall);
+ Assertions.assertEquals(CliExitCode.USAGE, e.getExitCode());
+ Assertions.assertTrue(e.getMessage().contains("cronjob.schedule"),
e.getMessage());
+ }
+
@Test
public void aProfileKeepsTheTraitsOfApplicationProperties(@TempDir Path
project) throws Exception {
// CAMEL-26934: with --profile the traits of application.properties
were left out; the profile only overrides