Fix #2638: fix condition for external kit and add test

e2e/common/scale_integration_test.go

@@ -23,6 +23,7 @@ limitations under the License.
 package common
 
 import (
+	"fmt"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -119,6 +120,26 @@ func TestIntegrationScale(t *testing.T) {
 				Should(gstruct.PointTo(BeNumerically("==", 1)))
 		})
 
+		t.Run("Scale integration with external image", func(t *testing.T) {
+			RegisterTestingT(t)
+
+			image := IntegrationPodImage(ns, name)()
+			Expect(image).NotTo(BeEmpty())
+			// Save resources by deleting the integration
+			Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+
+			Expect(Kamel("run", "-n", ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
+			Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+			Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+			Expect(ScaleIntegration(ns, name, 0)).To(Succeed())
+			Eventually(IntegrationPod(ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
+			Expect(ScaleIntegration(ns, name, 1)).To(Succeed())
+			Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+			Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+
+			Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+		})
+
 		// Clean up
 		RegisterTestingT(t)
 		Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())

pkg/trait/container.go

@@ -167,8 +167,8 @@ func isValidPullPolicy(policy corev1.PullPolicy) bool {
 }
 
 func (t *containerTrait) Apply(e *Environment) error {
-	if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
-		return t.configureImageIntegrationKit(e)
+	if err := t.configureImageIntegrationKit(e); err != nil {
+		return err
 	}
 	return t.configureContainer(e)
 }