Skip to content

fix(trait): report builder task strategy errors #6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
squakez merged 1 commit into from
May 20, 2026
Merged

fix(trait): report builder task strategy errors #6641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/controller/integration/build_kit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,19 @@ func TestCamelBuildKitKitSetOnIntegration(t *testing.T) {
// Move IntegrationKit phase to ready status
it.Status.Phase = v1.IntegrationPhaseBuildingKit
ik.Status.Phase = v1.IntegrationKitPhaseError
ik.Status.Failure = &v1.Failure{
Reason: "Pipeline tasks unavailable when using `routine` platform build strategy: use `pod` instead.",
Time: metav1.Now(),
}
c, err = internal.NewFakeClient(it, ik)
require.NoError(t, err)
a.InjectClient(c)
handledIt, err = a.Handle(context.TODO(), it)
require.NoError(t, err)
assert.Equal(t, v1.IntegrationPhaseError, handledIt.Status.Phase)
kitAvailable := handledIt.Status.GetCondition(v1.IntegrationConditionKitAvailable)
require.NotNil(t, kitAvailable)
assert.Contains(t, kitAvailable.Message, "Pipeline tasks unavailable when using `routine` platform build strategy: use `pod` instead.")

// Remove IntegrationKit
it.Status.Phase = v1.IntegrationPhaseBuildingKit
Expand Down
5 changes: 5 additions & 0 deletions pkg/trait/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/boolean"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
Expand Down Expand Up @@ -336,6 +337,10 @@ func failIntegrationKit(e *Environment, conditionType v1.IntegrationKitCondition
if e.IntegrationKit != nil {
e.IntegrationKit.Status.Phase = v1.IntegrationKitPhaseError
e.IntegrationKit.Status.SetCondition(conditionType, status, reason, message)
e.IntegrationKit.Status.Failure = &v1.Failure{
Reason: message,
Time: metav1.Now(),
}
if err := e.Client.Status().Update(e.Ctx, e.IntegrationKit); err != nil {
return err
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/trait/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ func TestCustomTaskBuilderTraitInvalidStrategy(t *testing.T) {
assert.Equal(t, v1.IntegrationKitPhaseError, env.IntegrationKit.Status.Phase)
assert.Equal(t, corev1.ConditionFalse, env.IntegrationKit.Status.Conditions[0].Status)
assert.Equal(t, env.IntegrationKit.Status.Conditions[0].Type, v1.IntegrationKitConditionType("IntegrationKitTasksValid"))
require.NotNil(t, env.IntegrationKit.Status.Failure)
assert.Equal(t, "Pipeline tasks unavailable when using `routine` platform build strategy: use `pod` instead.", env.IntegrationKit.Status.Failure.Reason)
}

func TestCustomTaskBuilderTraitInvalidStrategyOverride(t *testing.T) {
Expand All @@ -213,6 +215,8 @@ func TestCustomTaskBuilderTraitInvalidStrategyOverride(t *testing.T) {
assert.Equal(t, v1.IntegrationKitPhaseError, env.IntegrationKit.Status.Phase)
assert.Equal(t, corev1.ConditionFalse, env.IntegrationKit.Status.Conditions[0].Status)
assert.Equal(t, env.IntegrationKit.Status.Conditions[0].Type, v1.IntegrationKitConditionType("IntegrationKitTasksValid"))
require.NotNil(t, env.IntegrationKit.Status.Failure)
assert.Equal(t, "Pipeline tasks unavailable when using `routine` platform build strategy: use `pod` instead.", env.IntegrationKit.Status.Failure.Reason)
}

func TestMavenProfilesBuilderTrait(t *testing.T) {
Expand Down
Loading