You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2024/04/25 15:08:41 UTC

(camel-k) 02/02: fix(trait): skip mount sources when ...

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 ba354ef13548ef3b5034902d4a325e7d1c0942fb
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Apr 25 16:04:08 2024 +0200

    fix(trait): skip mount sources when ...
    
    ... IntegrationKit is synthetic
---
 e2e/common/misc/pipe_with_image_test.go | 4 ++--
 pkg/trait/mount.go                      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 525c83bb3..0cb9b53b8 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -61,7 +61,7 @@ func TestPipeWithImage(t *testing.T) {
 			)))
 			g.Eventually(IntegrationStatusImage(t, ctx, ns, bindingID)).
 				Should(Equal(expectedImage))
-			g.Eventually(IntegrationPodPhase(t, ctx, ns, bindingID), TestTimeoutLong).
+			g.Eventually(IntegrationPodPhase(t, ctx, ns, bindingID), TestTimeoutShort).
 				Should(Equal(corev1.PodRunning))
 			g.Eventually(IntegrationPodImage(t, ctx, ns, bindingID)).
 				Should(Equal(expectedImage))
@@ -79,7 +79,7 @@ func TestPipeWithImage(t *testing.T) {
 			)))
 			g.Eventually(IntegrationStatusImage(t, ctx, ns, bindingID)).
 				Should(Equal(expectedImage))
-			g.Eventually(IntegrationPodPhase(t, ctx, ns, bindingID), TestTimeoutLong).
+			g.Eventually(IntegrationPodPhase(t, ctx, ns, bindingID), TestTimeoutShort).
 				Should(Equal(corev1.PodRunning))
 			g.Eventually(IntegrationPodImage(t, ctx, ns, bindingID)).
 				Should(Equal(expectedImage))
diff --git a/pkg/trait/mount.go b/pkg/trait/mount.go
index 76cd01d0e..6a1eef6bd 100644
--- a/pkg/trait/mount.go
+++ b/pkg/trait/mount.go
@@ -113,8 +113,10 @@ func (t *mountTrait) Apply(e *Environment) error {
 	}
 
 	if visited {
-		// Volumes declared in the Integration resources
-		e.configureVolumesAndMounts(volumes, &container.VolumeMounts)
+		// Volumes declared in the Integration resources (we skip for synthetic kits)
+		if e.IntegrationKit == nil || !e.IntegrationKit.IsSynthetic() {
+			e.configureVolumesAndMounts(volumes, &container.VolumeMounts)
+		}
 		// Volumes declared in the trait config/resource options
 		err := t.configureVolumesAndMounts(volumes, &container.VolumeMounts)
 		if err != nil {