You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2024/02/01 15:22:53 UTC
(camel-k) 02/02: chore: generate updates
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit eb5057e756f3538cb671e58db8a421c38b6f5dc0
Author: Gaelle Fournier <ga...@gmail.com>
AuthorDate: Thu Feb 1 11:31:48 2024 +0100
chore: generate updates
---
.../crd/bases/camel.apache.org_integrationkits.yaml | 6 ++++++
.../bases/camel.apache.org_integrationplatforms.yaml | 12 ++++++++++++
config/crd/bases/camel.apache.org_integrations.yaml | 6 ++++++
.../crd/bases/camel.apache.org_kameletbindings.yaml | 6 ++++++
config/crd/bases/camel.apache.org_pipes.yaml | 6 ++++++
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 9 +++++++++
docs/modules/traits/pages/builder.adoc | 4 ++++
docs/modules/traits/pages/cron.adoc | 2 ++
helm/camel-k/crds/crd-integration-kit.yaml | 6 ++++++
helm/camel-k/crds/crd-integration-platform.yaml | 12 ++++++++++++
helm/camel-k/crds/crd-integration.yaml | 6 ++++++
helm/camel-k/crds/crd-kamelet-binding.yaml | 6 ++++++
helm/camel-k/crds/crd-pipe.yaml | 6 ++++++
pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 7 +++++++
resources/traits.yaml | 20 ++++++++++++--------
15 files changed, 106 insertions(+), 8 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml
index 13a8e5802..2a9de1441 100644
--- a/config/crd/bases/camel.apache.org_integrationkits.yaml
+++ b/config/crd/bases/camel.apache.org_integrationkits.yaml
@@ -201,6 +201,12 @@ spec:
description: The builder trait is internally used to determine
the best strategy to build and configure IntegrationKits.
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index 7d6b012d7..97dc83d03 100644
--- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -510,6 +510,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
@@ -2364,6 +2370,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml
index f7f71765e..558ba2dc9 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -6417,6 +6417,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 208613e03..574914b8c 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -6699,6 +6699,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to
+ use for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/config/crd/bases/camel.apache.org_pipes.yaml
index 2038cd3a5..7984794fc 100644
--- a/config/crd/bases/camel.apache.org_pipes.yaml
+++ b/config/crd/bases/camel.apache.org_pipes.yaml
@@ -6697,6 +6697,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to
+ use for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 44c752fff..c17c96335 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -5953,6 +5953,13 @@ map[string]string
Defines a set of nodes the builder pod is eligible to be scheduled on, based on labels on the node.
+|`annotations` +
+map[string]string
+|
+
+
+When using `pod` strategy, annotation to use for the builder pod.
+
|===
@@ -6157,6 +6164,8 @@ in order to save resources when the integration does not need to be executed.
Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`.
+WARNING: In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait, the component can't be customized.
+
The rules for using a Kubernetes CronJob are the following:
- `timer`: when period is set in milliseconds with no remaining seconds, for example 120000. If there is any second left as in 121000 (120s and 1s) or the presence of any of these parameters (delay, repeatCount, time) then a CronJob won't be created, but a standard deployment.
diff --git a/docs/modules/traits/pages/builder.adoc b/docs/modules/traits/pages/builder.adoc
index 22f17fa11..deb3481a8 100755
--- a/docs/modules/traits/pages/builder.adoc
+++ b/docs/modules/traits/pages/builder.adoc
@@ -109,6 +109,10 @@ if you need to execute them. Useful only with `pod` strategy.
| map[string]string
| Defines a set of nodes the builder pod is eligible to be scheduled on, based on labels on the node.
+| builder.annotations
+| map[string]string
+| When using `pod` strategy, annotation to use for the builder pod.
+
|===
// End of autogenerated code - DO NOT EDIT! (configuration)
diff --git a/docs/modules/traits/pages/cron.adoc b/docs/modules/traits/pages/cron.adoc
index 124ae3542..2250e3305 100755
--- a/docs/modules/traits/pages/cron.adoc
+++ b/docs/modules/traits/pages/cron.adoc
@@ -10,6 +10,8 @@ in order to save resources when the integration does not need to be executed.
Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`.
+WARNING: In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait, the component can't be customized.
+
The rules for using a Kubernetes CronJob are the following:
- `timer`: when period is set in milliseconds with no remaining seconds, for example 120000. If there is any second left as in 121000 (120s and 1s) or the presence of any of these parameters (delay, repeatCount, time) then a CronJob won't be created, but a standard deployment.
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml
index 13a8e5802..2a9de1441 100644
--- a/helm/camel-k/crds/crd-integration-kit.yaml
+++ b/helm/camel-k/crds/crd-integration-kit.yaml
@@ -201,6 +201,12 @@ spec:
description: The builder trait is internally used to determine
the best strategy to build and configure IntegrationKits.
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml
index 7d6b012d7..97dc83d03 100644
--- a/helm/camel-k/crds/crd-integration-platform.yaml
+++ b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -510,6 +510,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
@@ -2364,6 +2370,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
index f7f71765e..558ba2dc9 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -6417,6 +6417,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to use
+ for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index 208613e03..574914b8c 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -6699,6 +6699,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to
+ use for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
index 2038cd3a5..7984794fc 100644
--- a/helm/camel-k/crds/crd-pipe.yaml
+++ b/helm/camel-k/crds/crd-pipe.yaml
@@ -6697,6 +6697,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
+ annotations:
+ additionalProperties:
+ type: string
+ description: When using `pod` strategy, annotation to
+ use for the builder pod.
+ type: object
baseImage:
description: Specify a base image
type: string
diff --git a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
index 4b6191a0c..28edd1939 100644
--- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
@@ -106,6 +106,13 @@ func (in *BuilderTrait) DeepCopyInto(out *BuilderTrait) {
(*out)[key] = val
}
}
+ if in.Annotations != nil {
+ in, out := &in.Annotations, &out.Annotations
+ *out = make(map[string]string, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BuilderTrait.
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 5fd331dd2..747827bea 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -309,6 +309,9 @@ traits:
type: map[string]string
description: Defines a set of nodes the builder pod is eligible to be scheduled
on, based on labels on the node.
+ - name: annotations
+ type: map[string]string
+ description: When using `pod` strategy, annotation to use for the builder pod.
- name: camel
platform: true
profiles:
@@ -396,14 +399,15 @@ traits:
For such tasks, the cron trait can materialize the integration as a Kubernetes
CronJob instead of a standard deployment, in order to save resources when the
integration does not need to be executed. Integrations that start from the following
- components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The rules
- for using a Kubernetes CronJob are the following: - `timer`: when period is set
- in milliseconds with no remaining seconds, for example 120000. If there is any
- second left as in 121000 (120s and 1s) or the presence of any of these parameters
- (delay, repeatCount, time) then a CronJob won''t be created, but a standard deployment.
- - `cron`, `quartz`: when the cron expression does not contain seconds (or the
- "seconds" part is set to 0). E.g. `cron:tab?schedule=0/2${plus}*{plus}*{plus}*{plus}?`
- or `quartz:trigger?cron=0{plus}0/2{plus}*{plus}*{plus}*{plus}?`.'
+ components are evaluated by the cron trait: `timer`, `cron`, `quartz`. WARNING:
+ In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait,
+ the component can''t be customized. The rules for using a Kubernetes CronJob are
+ the following: - `timer`: when period is set in milliseconds with no remaining
+ seconds, for example 120000. If there is any second left as in 121000 (120s and
+ 1s) or the presence of any of these parameters (delay, repeatCount, time) then
+ a CronJob won''t be created, but a standard deployment. - `cron`, `quartz`: when
+ the cron expression does not contain seconds (or the "seconds" part is set to
+ 0). E.g. `cron:tab?schedule=0/2${plus}*{plus}*{plus}*{plus}?` or `quartz:trigger?cron=0{plus}0/2{plus}*{plus}*{plus}*{plus}?`.'
properties:
- name: enabled
type: bool