diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 4b48625fdd..5f4b857d27 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -1572,6 +1572,13 @@ IntegrationKitTraits defines traits assigned to an `IntegrationKit` The builder trait is internally used to determine the best strategy to build and configure IntegrationKits. +|`camel` + +*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]* +| + + +The Camel trait sets up Camel configuration. + |`quarkus` + *xref:#_camel_apache_org_v1_trait_QuarkusTrait[QuarkusTrait]* | @@ -1588,13 +1595,6 @@ NOTE: Compiling to a native executable, i.e. when using `package-type=native`, i The Registry trait sets up Maven to use the Image registry as a Maven repository. -|`camel` + -*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]* -| - - -The Camel trait sets up Camel configuration. - |`addons` + *xref:#_camel_apache_org_v1_AddonTrait[map[string\]github.com/apache/camel-k/pkg/apis/camel/v1.AddonTrait]* | diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index d4d0b3e4b2..8bf7b1d465 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -828,6 +828,11 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) { *out = new(trait.BuilderTrait) (*in).DeepCopyInto(*out) } + if in.Camel != nil { + in, out := &in.Camel, &out.Camel + *out = new(trait.CamelTrait) + (*in).DeepCopyInto(*out) + } if in.Quarkus != nil { in, out := &in.Quarkus, &out.Quarkus *out = new(trait.QuarkusTrait) @@ -838,11 +843,6 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) { *out = new(trait.RegistryTrait) (*in).DeepCopyInto(*out) } - if in.Camel != nil { - in, out := &in.Camel, &out.Camel - *out = new(trait.CamelTrait) - (*in).DeepCopyInto(*out) - } if in.Addons != nil { in, out := &in.Addons, &out.Addons *out = make(map[string]AddonTrait, len(*in)) diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 70f1a9fa52..d2d95c7a63 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -26,7 +26,7 @@ const ( Version = "1.10.3-SNAPSHOT" // DefaultRuntimeVersion -- - DefaultRuntimeVersion = "1.15.1" + DefaultRuntimeVersion = "1.15.2" // BuildahVersion -- BuildahVersion = "1.23.3"