(camel-k) branch main updated: chore(trait): revert platform usage

[pc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

squakez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new 935de0c3c chore(trait): revert platform usage
935de0c3c is described below

commit 935de0c3cdf16933de60cefdcb61e5b75eb2413f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Apr 29 08:44:05 2026 +0200

    chore(trait): revert platform usage
---
 pkg/trait/quarkus.go              |  2 +-
 pkg/trait/trait_configure.go      |  9 +++++++++
 pkg/trait/trait_configure_test.go | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index c1a56ab2a..bf8ca05e0 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -324,7 +324,7 @@ func propagateKitTraits(e *Environment) v1.IntegrationKitTraits {
 	kitTraits := v1.IntegrationKitTraits{}
 
 	ip, err := platform.GetForResource(e.Ctx, e.Client, e.Integration)
-	if ip != nil && err != nil {
+	if ip != nil && err == nil {
 		propagate(fmt.Sprintf("platform %q", ip.Name), ip.Status.Traits, &kitTraits)
 	}
 
diff --git a/pkg/trait/trait_configure.go b/pkg/trait/trait_configure.go
index 599062109..73a9f8a9d 100644
--- a/pkg/trait/trait_configure.go
+++ b/pkg/trait/trait_configure.go
@@ -27,6 +27,7 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 
 	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+	"github.com/apache/camel-k/v2/pkg/platform"
 	"github.com/apache/camel-k/v2/pkg/util"
 )
 
@@ -46,7 +47,15 @@ func (c *Catalog) Configure(env *Environment) error {
 			return err
 		}
 	}
+	//nolint:nestif
 	if env.Integration != nil {
+		ip, err := platform.GetForResource(env.Ctx, env.Client, env.Integration)
+		if ip != nil && err == nil {
+			if err := c.configureTraits(ip.Status.Traits); err != nil {
+				return err
+			}
+		}
+
 		if err := c.configureTraits(env.Integration.Spec.Traits); err != nil {
 			return err
 		}
diff --git a/pkg/trait/trait_configure_test.go b/pkg/trait/trait_configure_test.go
index a6cd1bbe3..0d41770e4 100644
--- a/pkg/trait/trait_configure_test.go
+++ b/pkg/trait/trait_configure_test.go
@@ -18,6 +18,7 @@ limitations under the License.
 package trait
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -28,11 +29,16 @@ 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/internal"
 	"github.com/apache/camel-k/v2/pkg/util/boolean"
 )
 
 func TestTraitConfiguration(t *testing.T) {
+	cl, err := internal.NewFakeClient()
+	require.NoError(t, err)
 	env := Environment{
+		Ctx:    context.Background(),
+		Client: cl,
 		Integration: &v1.Integration{
 			Spec: v1.IntegrationSpec{
 				Traits: v1.Traits{
@@ -65,7 +71,11 @@ func TestTraitConfiguration(t *testing.T) {
 }
 
 func TestTraitConfigurationFromAnnotations(t *testing.T) {
+	cl, err := internal.NewFakeClient()
+	require.NoError(t, err)
 	env := Environment{
+		Ctx:    context.Background(),
+		Client: cl,
 		Integration: &v1.Integration{
 			ObjectMeta: metav1.ObjectMeta{
 				Annotations: map[string]string{
@@ -93,7 +103,11 @@ func TestTraitConfigurationFromAnnotations(t *testing.T) {
 }
 
 func TestFailOnWrongTraitAnnotations(t *testing.T) {
+	cl, err := internal.NewFakeClient()
+	require.NoError(t, err)
 	env := Environment{
+		Ctx:    context.Background(),
+		Client: cl,
 		Integration: &v1.Integration{
 			ObjectMeta: metav1.ObjectMeta{
 				Annotations: map[string]string{
@@ -107,7 +121,11 @@ func TestFailOnWrongTraitAnnotations(t *testing.T) {
 }
 
 func TestTraitListConfigurationFromAnnotations(t *testing.T) {
+	cl, err := internal.NewFakeClient()
+	require.NoError(t, err)
 	env := Environment{
+		Ctx:    context.Background(),
+		Client: cl,
 		Integration: &v1.Integration{
 			ObjectMeta: metav1.ObjectMeta{
 				Annotations: map[string]string{
@@ -126,7 +144,11 @@ func TestTraitListConfigurationFromAnnotations(t *testing.T) {
 }
 
 func TestTraitSplitConfiguration(t *testing.T) {
+	cl, err := internal.NewFakeClient()
+	require.NoError(t, err)
 	env := Environment{
+		Ctx:    context.Background(),
+		Client: cl,
 		Integration: &v1.Integration{
 			ObjectMeta: metav1.ObjectMeta{
 				Annotations: map[string]string{