fix(trait): execute GC only in running phases

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

@@ -8746,6 +8746,8 @@ List of Services in the form [[apigroup/]version:]kind:[namespace/]name
 The Service trait exposes the integration with a Service resource so that it can be accessed by other applications
 (or integrations) in the same namespace.
 
+NOTE: this trait is automatically disabled if the Knative Service trait is enabled.
+
 It's enabled by default if the integration depends on a Camel component that can expose a HTTP endpoint.
 
 

docs/modules/traits/pages/service.adoc

@@ -6,6 +6,8 @@
 The Service trait exposes the integration with a Service resource so that it can be accessed by other applications
 (or integrations) in the same namespace.
 
+NOTE: this trait is automatically disabled if the Knative Service trait is enabled.
+
 It's enabled by default if the integration depends on a Camel component that can expose a HTTP endpoint.
 
 

e2e/common/traits/gc_test.go

@@ -25,6 +25,7 @@ package common
 import (
 	"context"
 	"testing"
+	"time"
 
 	. "github.com/onsi/gomega"
 
@@ -38,11 +39,19 @@ func TestGarbageCollectorTrait(t *testing.T) {
 		t.Run("Delete outdated resources", func(t *testing.T) {
 			g.Expect(KamelRun(t, ctx, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
 			g.Eventually(IntegrationPodPhase(t, ctx, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-			g.Eventually(ServicesByType(t, ctx, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+			g.Eventually(ServicesByType(t, ctx, ns, corev1.ServiceTypeClusterIP), TestTimeoutShort).ShouldNot(BeEmpty())
+			g.Eventually(Deployment(t, ctx, ns, "platform-http-server"), TestTimeoutShort).ShouldNot(BeNil())
+			genOneDeploymentUID := DeploymentUID(t, ctx, ns, "platform-http-server")()
 
 			// Update integration and disable service trait - existing service should be garbage collected
 			g.Expect(KamelRun(t, ctx, ns, "files/PlatformHttpServer.java", "-t", "service.enabled=false").Execute()).To(Succeed())
-			g.Eventually(ServicesByType(t, ctx, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).Should(BeEmpty())
+			g.Eventually(ServicesByType(t, ctx, ns, corev1.ServiceTypeClusterIP), TestTimeoutShort).Should(BeEmpty())
+			g.Eventually(Deployment(t, ctx, ns, "platform-http-server"), TestTimeoutShort).ShouldNot(BeNil())
+
+			// IMPORTANT: The Deployment UID must not change, otherwise we won't honor rolling upgrades as we delete and create a
+			// new Deployment for every Integration change.
+			g.Consistently(DeploymentUID(t, ctx, ns, "platform-http-server"), 3*time.Second, 1*time.Minute).
+				Should(Equal(genOneDeploymentUID))
 		})
 	})
 }

e2e/support/test_support.go

@@ -839,16 +839,6 @@ func Service(t *testing.T, ctx context.Context, ns string, name string) func() *
 	}
 }
 
-func ServiceType(t *testing.T, ctx context.Context, ns string, name string) func() corev1.ServiceType {
-	return func() corev1.ServiceType {
-		svc := Service(t, ctx, ns, name)()
-		if svc == nil {
-			return ""
-		}
-		return svc.Spec.Type
-	}
-}
-
 // ServicesByType Find the service in the given namespace with the given type
 func ServicesByType(t *testing.T, ctx context.Context, ns string, svcType corev1.ServiceType) func() []corev1.Service {
 	return func() []corev1.Service {
@@ -1850,6 +1840,12 @@ func DeploymentCondition(t *testing.T, ctx context.Context, ns string, name stri
 	}
 }
 
+func DeploymentUID(t *testing.T, ctx context.Context, ns string, name string) func() string {
+	return func() string {
+		return string(Deployment(t, ctx, ns, name)().GetUID())
+	}
+}
+
 func Build(t *testing.T, ctx context.Context, ns, name string) func() *v1.Build {
 	return func() *v1.Build {
 		build := v1.NewBuild(ns, name)

pkg/apis/camel/v1/trait/service.go

@@ -20,6 +20,8 @@ package trait
 // The Service trait exposes the integration with a Service resource so that it can be accessed by other applications
 // (or integrations) in the same namespace.
 //
+// NOTE: this trait is automatically disabled if the Knative Service trait is enabled.
+//
 // It's enabled by default if the integration depends on a Camel component that can expose a HTTP endpoint.
 //
 // +camel-k:trait=service.

pkg/trait/gc.go

@@ -113,7 +113,9 @@ func (t *gcTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
 		return false, NewIntegrationConditionUserDisabled("GC"), nil
 	}
 
-	return e.IntegrationInPhase(v1.IntegrationPhaseInitialization) || e.IntegrationInRunningPhases(), nil, nil
+	// We need to execute this trait only when all resources have been created and
+	// deployed with a new generation if there is was any change during the Integration drift.
+	return e.IntegrationInRunningPhases(), nil, nil
 }
 
 func (t *gcTrait) Apply(e *Environment) error {