(camel-k) branch main updated: fix(core): Fix tooling image on multi-arch

[pc...@apache.org]

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


The following commit(s) were added to refs/heads/main by this push:
     new 589cfb7b4 fix(core): Fix tooling image on multi-arch
589cfb7b4 is described below

commit 589cfb7b4d26ffdc8350898461a9323acec2e4da
Author: Gaelle Fournier <ga...@gmail.com>
AuthorDate: Thu Dec 21 15:04:48 2023 +0100

    fix(core): Fix tooling image on multi-arch
---
 e2e/commonwithcustominstall/builder_test.go | 5 +++++
 pkg/controller/integrationkit/build.go      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/e2e/commonwithcustominstall/builder_test.go b/e2e/commonwithcustominstall/builder_test.go
index a269a47e4..a2068e98f 100644
--- a/e2e/commonwithcustominstall/builder_test.go
+++ b/e2e/commonwithcustominstall/builder_test.go
@@ -57,6 +57,9 @@ func TestBuilderTimeout(t *testing.T) {
 			},
 		))
 
+		operatorPod := OperatorPod(ns)()
+		operatorPodImage := operatorPod.Spec.Containers[0].Image
+
 		t.Run("run yaml", func(t *testing.T) {
 			name := RandomizedSuffixName("yaml")
 			Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml",
@@ -68,6 +71,8 @@ func TestBuilderTimeout(t *testing.T) {
 			builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
 			Eventually(BuilderPodPhase(ns, builderKitName)).Should(Equal(corev1.PodPending))
 			Eventually(BuildPhase(ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
+			Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
+			Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
 			// After a few minutes (5 max retries), this has to be in error state
 			Eventually(BuildPhase(ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
 			Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
diff --git a/pkg/controller/integrationkit/build.go b/pkg/controller/integrationkit/build.go
index 4880ad365..105124588 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -134,7 +134,7 @@ func (action *buildAction) handleBuildSubmitted(ctx context.Context, kit *v1.Int
 		}
 		// The build operation, when executed as a Pod, should be executed by a container image containing the
 		// `kamel builder` command. Likely the same image running the operator should be fine.
-		buildConfig.ToolImage = defaults.OperatorImage()
+		buildConfig.ToolImage = platform.OperatorImage
 		buildConfig.BuilderPodNamespace = operatorNamespace
 		v1.SetBuilderConfigurationTasks(env.Pipeline, buildConfig)