feat(api): store executed traits in status

addons/master/master.go

@@ -66,7 +66,7 @@ type Trait struct {
 type masterTrait struct {
 	trait.BaseTrait
 	Trait                `property:",squash"`
-	delegateDependencies []string `json:"-"`
+	delegateDependencies []string
 }
 
 // NewMasterTrait --.
@@ -105,7 +105,7 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool, *trait.TraitConditi
 			}
 		}
 		if found {
-			if t.IncludeDelegateDependencies == nil || *t.IncludeDelegateDependencies {
+			if ptr.Deref(t.IncludeDelegateDependencies, true) {
 				t.delegateDependencies = findAdditionalDependencies(e, meta)
 			}
 		}
@@ -117,28 +117,17 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool, *trait.TraitConditi
 		return false, nil, err
 	}
 	if enabled {
+		t.Enabled = ptr.To(enabled)
 		if t.ResourceName == nil {
 			val := e.Integration.Name + "-lock"
 			t.ResourceName = &val
 		}
-
-		if t.ResourceType == nil {
-			t.ResourceType = ptr.To(leaseResourceType)
-		}
-
-		if t.LabelKey == nil {
-			val := v1.IntegrationLabel
-			t.LabelKey = &val
-		}
-
 		if t.LabelValue == nil {
 			t.LabelValue = &e.Integration.Name
 		}
-
-		return true, nil, nil
 	}
 
-	return false, nil, nil
+	return enabled, nil, nil
 }
 
 func (t *masterTrait) Apply(e *trait.Environment) error {
@@ -172,49 +161,50 @@ func (t *masterTrait) setCustomizerConfiguration(e *trait.Environment) {
 	e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
 		v1.ConfigurationSpec{Type: "property", Value: "customizer.master.enabled=true"},
 	)
-	if t.ResourceName != nil {
-		resourceName := t.ResourceName
-		e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
-			v1.ConfigurationSpec{Type: "property", Value: "customizer.master.kubernetesResourceNames=" + *resourceName},
-		)
-	}
-	if t.ResourceType != nil {
-		e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
-			v1.ConfigurationSpec{Type: "property", Value: "customizer.master.leaseResourceType" + *t.ResourceType},
-		)
-	}
-	if t.LabelKey != nil {
-		e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
-			v1.ConfigurationSpec{Type: "property", Value: "customizer.master.labelKey=" + *t.LabelKey},
-		)
-	}
-	if t.LabelValue != nil {
-		e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
-			v1.ConfigurationSpec{Type: "property", Value: "customizer.master.labelValue=" + *t.LabelValue},
-		)
-	}
+	e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
+		v1.ConfigurationSpec{Type: "property", Value: "customizer.master.kubernetesResourceNames=" + *t.ResourceName},
+	)
+	e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
+		v1.ConfigurationSpec{Type: "property", Value: "customizer.master.leaseResourceType" + t.getResourceKey()},
+	)
+	e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
+		v1.ConfigurationSpec{Type: "property", Value: "customizer.master.labelKey=" + t.getLabelKey()},
+	)
+	e.Integration.Status.Configuration = append(e.Integration.Status.Configuration,
+		v1.ConfigurationSpec{Type: "property", Value: "customizer.master.labelValue=" + *t.LabelValue},
+	)
 }
 
 func (t *masterTrait) setCatalogConfiguration(e *trait.Environment) {
 	if e.ApplicationProperties == nil {
 		e.ApplicationProperties = make(map[string]string)
 	}
-	if t.ResourceName != nil {
-		e.ApplicationProperties["camel.k.master.resourceName"] = *t.ResourceName
-	}
-	if t.ResourceType != nil {
-		e.ApplicationProperties["camel.k.master.resourceType"] = *t.ResourceType
-	}
-	if t.LabelKey != nil && t.LabelValue != nil {
-		e.ApplicationProperties["camel.k.master.labelKey"] = *t.LabelKey
-		e.ApplicationProperties["camel.k.master.labelValue"] = *t.LabelValue
-	}
+	e.ApplicationProperties["camel.k.master.resourceName"] = *t.ResourceName
+	e.ApplicationProperties["camel.k.master.resourceType"] = t.getResourceKey()
+	e.ApplicationProperties["camel.k.master.labelKey"] = t.getLabelKey()
+	e.ApplicationProperties["camel.k.master.labelValue"] = *t.LabelValue
 
 	for _, cp := range e.CamelCatalog.Runtime.Capabilities["master"].RuntimeProperties {
 		e.ApplicationProperties[trait.CapabilityPropertyKey(cp.Key, e.ApplicationProperties)] = cp.Value
 	}
 }
 
+func (t *masterTrait) getResourceKey() string {
+	if t.ResourceType == nil {
+		return leaseResourceType
+	}
+
+	return *t.ResourceType
+}
+
+func (t *masterTrait) getLabelKey() string {
+	if t.LabelKey == nil {
+		return v1.IntegrationLabel
+	}
+
+	return *t.LabelKey
+}
+
 func findAdditionalDependencies(e *trait.Environment, meta metadata.IntegrationMetadata) []string {
 	var dependencies []string
 	for _, endpoint := range meta.FromURIs {

addons/master/master_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+	traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
 	"github.com/apache/camel-k/v2/pkg/trait"
 	"github.com/apache/camel-k/v2/pkg/util/camel"
 	"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -29,6 +30,7 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 )
 
 func TestMasterOn(t *testing.T) {
@@ -184,3 +186,79 @@ func TestMasterOff(t *testing.T) {
 	assert.Empty(t, conditions)
 	assert.False(t, configured)
 }
+
+func TestMasterAuto(t *testing.T) {
+	catalog, err := camel.DefaultCatalog()
+	require.NoError(t, err)
+
+	client, err := test.NewFakeClient()
+	require.NoError(t, err)
+	traitCatalog := trait.NewCatalog(nil)
+
+	environment := trait.Environment{
+		CamelCatalog: catalog,
+		Catalog:      traitCatalog,
+		Client:       client,
+		Integration: &v1.Integration{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "test",
+				Namespace: "ns",
+			},
+			Status: v1.IntegrationStatus{
+				Phase: v1.IntegrationPhaseInitialization,
+			},
+			Spec: v1.IntegrationSpec{
+				Profile: v1.TraitProfileKnative,
+				Sources: []v1.SourceSpec{
+					{
+						DataSpec: v1.DataSpec{
+							Name:    "Master.java",
+							Content: `from("master:lock:timer:tick").to("log:test")`,
+						},
+						Language: v1.LanguageJavaSource,
+					},
+				},
+			},
+		},
+		Platform: &v1.IntegrationPlatform{
+			Spec: v1.IntegrationPlatformSpec{
+				Cluster: v1.IntegrationPlatformClusterOpenShift,
+				Build: v1.IntegrationPlatformBuildSpec{
+					PublishStrategy: v1.IntegrationPlatformBuildPublishStrategyS2I,
+					Registry:        v1.RegistrySpec{Address: "registry"},
+					RuntimeVersion:  catalog.Runtime.Version,
+				},
+				Profile: v1.TraitProfileKnative,
+			},
+			Status: v1.IntegrationPlatformStatus{
+				Phase: v1.IntegrationPlatformPhaseReady,
+			},
+		},
+		EnvVars:        make([]corev1.EnvVar, 0),
+		ExecutedTraits: make([]trait.Trait, 0),
+		Resources:      kubernetes.NewCollection(),
+	}
+	environment.Platform.ResyncStatusFullConfig()
+
+	mt := NewMasterTrait()
+	mt.InjectClient(client)
+	trait, _ := mt.(*masterTrait)
+	// Initialization phase
+	configured, conditions, err := trait.Configure(&environment)
+	require.NoError(t, err)
+	assert.Empty(t, conditions)
+	assert.True(t, configured)
+	err = trait.Apply(&environment)
+	require.NoError(t, err)
+
+	expectedTrait := &masterTrait{
+		Trait: Trait{
+			Trait: traitv1.Trait{
+				Enabled: ptr.To(true),
+			},
+			ResourceName: ptr.To("test-lock"),
+			LabelValue:   ptr.To("test"),
+		},
+	}
+	assert.Equal(t, expectedTrait.Trait, trait.Trait)
+}

addons/resume/resume.go

@@ -20,10 +20,8 @@ package resume
 import (
 	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
 	traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
-	"github.com/apache/camel-k/v2/pkg/metadata"
 	"github.com/apache/camel-k/v2/pkg/trait"
 	"github.com/apache/camel-k/v2/pkg/util"
-	"github.com/apache/camel-k/v2/pkg/util/log"
 	"k8s.io/utils/ptr"
 )
 
@@ -46,6 +44,7 @@ import (
 type Trait struct {
 	traitv1.Trait `property:",squash"`
 	// Enables automatic configuration of the trait.
+	// Deprecated: not in use.
 	Auto *bool `property:"auto" json:"auto,omitempty"`
 	// The type of the resume strategy to use
 	ResumeStrategy string `property:"resume-strategy,omitempty"`
@@ -64,8 +63,8 @@ type resumeTrait struct {
 }
 
 const (
-	KafkaSingle  = "org.apache.camel.processor.resume.kafka.SingleNodeKafkaResumeStrategy"
-	StrategyPath = "camel-k-offsets"
+	kafkaSingle  = "org.apache.camel.processor.resume.kafka.SingleNodeKafkaResumeStrategy"
+	strategyPath = "camel-k-offsets"
 )
 
 func NewResumeTrait() trait.Trait {
@@ -82,28 +81,7 @@ func (r *resumeTrait) Configure(environment *trait.Environment) (bool, *trait.Tr
 		return false, nil, nil
 	}
 
-	if ptr.Deref(r.Auto, true) {
-		_, err := environment.ConsumeMeta(func(meta metadata.IntegrationMetadata) bool {
-			for _, endpoint := range meta.FromURIs {
-				log.Infof("Processing component %s", endpoint)
-			}
-
-			return true
-		})
-		if err != nil {
-			return false, nil, err
-		}
-
-		if r.ResumeStrategy == "" {
-			r.ResumeStrategy = KafkaSingle
-		}
-
-		if r.ResumePath == "" {
-			r.ResumePath = StrategyPath
-		}
-	}
-
-	return r.Enabled != nil && *r.Enabled, nil, nil
+	return ptr.Deref(r.Enabled, false), nil, nil
 }
 
 func (r *resumeTrait) Apply(environment *trait.Environment) error {
@@ -113,11 +91,27 @@ func (r *resumeTrait) Apply(environment *trait.Environment) error {
 
 	if environment.IntegrationInRunningPhases() {
 		environment.ApplicationProperties["customizer.resume.enabled"] = "true"
-		environment.ApplicationProperties["customizer.resume.resumeStrategy"] = r.ResumeStrategy
-		environment.ApplicationProperties["customizer.resume.resumePath"] = r.ResumePath
+		environment.ApplicationProperties["customizer.resume.resumeStrategy"] = r.getResumeStrategy()
+		environment.ApplicationProperties["customizer.resume.resumePath"] = r.getResumePath()
 		environment.ApplicationProperties["customizer.resume.resumeServer"] = r.ResumeServer
 		environment.ApplicationProperties["customizer.resume.cacheFillPolicy"] = r.CacheFillPolicy
 	}
 
 	return nil
 }
+
+func (r *resumeTrait) getResumeStrategy() string {
+	if r.ResumeStrategy == "" {
+		return kafkaSingle
+	}
+
+	return r.ResumeStrategy
+}
+
+func (r *resumeTrait) getResumePath() string {
+	if r.ResumePath == "" {
+		return strategyPath
+	}
+
+	return r.ResumePath
+}

docs/modules/ROOT/partials/apis/camel-k-crds.adoc

@@ -3533,6 +3533,13 @@ a list of dependencies needed by the application
 
 the profile needed to run this Integration
 
+|`traits` +
+*xref:#_camel_apache_org_v1_Traits[Traits]*
+|
+
+
+the traits executed for the Integration
+
 |`integrationKit` +
 *https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
 |
@@ -5817,6 +5824,7 @@ TraitConfiguration parameters configuration
 * <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
 * <<#_camel_apache_org_v1_IntegrationProfileSpec, IntegrationProfileSpec>>
 * <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
+* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
 
 Traits represents the collection of trait configurations.
 

docs/modules/traits/pages/resume.adoc

@@ -43,6 +43,7 @@ The following configuration options are available:
 | resume.auto
 | bool
 | Enables automatic configuration of the trait.
+Deprecated: not in use.
 
 | resume.resume-strategy,omitempty
 | string