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 31d44827b5b1a2047482fdfd7503fbb5267494ca
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Wed Nov 2 09:44:44 2022 +0100
chore: trait alphabetical order
---
pkg/apis/camel/v1/integrationkit_types.go | 4 ++--
pkg/trait/trait_test.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/apis/camel/v1/integrationkit_types.go
b/pkg/apis/camel/v1/integrationkit_types.go
index 7b7fb53ab..c7efc896e 100644
--- a/pkg/apis/camel/v1/integrationkit_types.go
+++ b/pkg/apis/camel/v1/integrationkit_types.go
@@ -71,14 +71,14 @@ type IntegrationKitSpec struct {
type IntegrationKitTraits struct {
// The builder trait is internally used to determine the best strategy
to build and configure IntegrationKits.
Builder *trait.BuilderTrait `property:"builder"
json:"builder,omitempty"`
+ // The Camel trait sets up Camel configuration.
+ Camel *trait.CamelTrait `property:"camel" json:"camel,omitempty"`
// The Quarkus trait configures the Quarkus runtime.
// It's enabled by default.
// NOTE: Compiling to a native executable, i.e. when using
`package-type=native`, is only supported for kamelets, as well as YAML and XML
integrations. It also requires at least 4GiB of memory, so the Pod running the
native build, that is either the operator Pod, or the build Pod (depending on
the build strategy configured for the platform), must have enough memory
available.
Quarkus *trait.QuarkusTrait `property:"quarkus"
json:"quarkus,omitempty"`
// The Registry trait sets up Maven to use the Image registry as a
Maven repository.
Registry *trait.RegistryTrait `property:"registry"
json:"registry,omitempty"`
- // The Camel trait sets up Camel configuration.
- Camel *trait.CamelTrait `property:"camel" json:"camel,omitempty"`
// The collection of addon trait configurations
Addons map[string]AddonTrait `json:"addons,omitempty"`
}
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index c04c33bcf..2ff2420bc 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -457,7 +457,7 @@ func TestConfigureVolumesAndMountsBinaryAndTextResources(t
*testing.T) {
func TestOnlySomeTraitsInfluenceBuild(t *testing.T) {
c := NewTraitTestCatalog()
- buildTraits := []string{"builder", "quarkus", "registry", "camel"}
+ buildTraits := []string{"builder", "camel", "quarkus", "registry"}
for _, trait := range c.AllTraits() {
if trait.InfluencesKit() {
