This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0a305beb01cbc8c868aabf3c74a7cffeee314592
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Oct 25 23:46:23 2023 +0000
chore: autogenerated project resource update
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 6 +++++-
docs/modules/traits/pages/jvm.adoc | 6 +++++-
pkg/resources/resources.go | 4 ++--
resources/traits.yaml | 7 ++++++-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 4799180e7..b7c9b9604 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -6752,7 +6752,11 @@ Forces the value for labels `sidecar.istio.io/inject`.
By default the label is s
* <<#_camel_apache_org_v1_Traits, Traits>>
-The JVM trait is used to configure the JVM that runs the integration.
+The JVM trait is used to configure the JVM that runs the Integration. This
trait can be configured only for Integration and related IntegrationKits
+(bound to a container image) built by Camel K operator. If the system detects
the usage of a different container image (ie, built externally), then, the
+trait is disabled by the platform.
+
+NOTE: the platform will skip the trait configuration for those container image
matching `camel-k-kit-` name.
[cols="2,2a",options="header"]
diff --git a/docs/modules/traits/pages/jvm.adoc
b/docs/modules/traits/pages/jvm.adoc
index 7c7056d5c..6e2654c44 100755
--- a/docs/modules/traits/pages/jvm.adoc
+++ b/docs/modules/traits/pages/jvm.adoc
@@ -1,7 +1,11 @@
= Jvm Trait
// Start of autogenerated code - DO NOT EDIT! (description)
-The JVM trait is used to configure the JVM that runs the integration.
+The JVM trait is used to configure the JVM that runs the Integration. This
trait can be configured only for Integration and related IntegrationKits
+(bound to a container image) built by Camel K operator. If the system detects
the usage of a different container image (ie, built externally), then, the
+trait is disabled by the platform.
+
+NOTE: the platform will skip the trait configuration for those container image
matching `camel-k-kit-` name.
This trait is available in the following profiles: **Kubernetes, Knative,
OpenShift**.
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 0dc749afd..29a40fb4c 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -625,9 +625,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 72796,
+ uncompressedSize: 73193,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1c\xb9\x91\x00\xf8\x5d\xbf\x02\xd1\x73\x1b\x24\x75\xfd\xa0\xc6\x6b\xef\x2c\xd7\xf2\x1e\x47\xa3\xb1\x69\xbd\x78\x22\x67\xbc\x0e\x9d\xc2\x8d\xae\x42\x77\x43\xac\x06\x6a\x00\x14\xa9\x9e\xdb\xfb\xef\x17\xc8\x4c\x3c\xaa\xba\x9a\xdd\x94\x48\xd9\xda\xf5\x6e\x84\x47\x24\x0b\x40\x22\x91\x48\xe4\x3b\xbf\x61\xa3\xfb\xfb\xbf\x47\xdf\xb0\x97\xb2\x10\xca\x8a\x92\x39\xcd\xdc\x52\xb0\xd3\x9a\x17\x4b\xc1\x2e\xf4\xdc\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1c\xb9\x91\x00\xf8\x5d\xbf\x02\xd1\x73\x1b\x24\x75\xfd\xa0\xc6\x6b\xef\x2c\xd7\xf2\x1e\x47\xa3\xb1\x69\xbd\x78\x22\x67\xbc\x0e\x9d\xc2\x8d\xae\x42\x77\x43\xac\x06\x6a\x00\x14\xa9\x9e\xdb\xfb\xef\x17\xc8\x4c\x3c\xaa\xba\x9a\xdd\x94\x48\xd9\xda\xf5\x6e\x84\x47\x24\x0b\x40\x22\x91\x48\xe4\x3b\xbf\x61\xa3\xfb\xfb\xbf\x47\xdf\xb0\x97\xb2\x10\xca\x8a\x92\x39\xcd\xdc\x52\xb0\xd3\x9a\x17\x4b\xc1\x2e\xf4\xdc\x
[...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/traits.yaml b/resources/traits.yaml
index dee0be418..8eb955ea4 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -865,7 +865,12 @@ traits:
- Kubernetes
- Knative
- OpenShift
- description: The JVM trait is used to configure the JVM that runs the
integration.
+ description: 'The JVM trait is used to configure the JVM that runs the
Integration.
+ This trait can be configured only for Integration and related
IntegrationKits
+ (bound to a container image) built by Camel K operator. If the system
detects
+ the usage of a different container image (ie, built externally), then, the
trait
+ is disabled by the platform. NOTE: the platform will skip the trait
configuration
+ for those container image matching `camel-k-kit-` name.'
properties:
- name: enabled
type: bool
