MultiArchitecture support

pkg/apis/camel/v1/build_types.go

@@ -108,7 +108,7 @@ type BuildahTask struct {
 	BaseTask    `json:",inline"`
 	PublishTask `json:",inline"`
 	// The platform of build image
-	Platform string `json:"baseImage,omitempty"`
+	Platform string `json:"platform,omitempty"`
 	// log more information
 	Verbose *bool `json:"verbose,omitempty"`
 }

pkg/controller/build/build_pod.go

@@ -238,18 +238,34 @@ func addBuildTaskToPod(build *v1.Build, taskName string, pod *corev1.Pod) {
 }
 
 func addBuildahTaskToPod(ctx context.Context, c ctrl.Reader, build *v1.Build, task *v1.BuildahTask, pod *corev1.Pod) error {
-	bud := []string{
-		"buildah",
-		"bud",
-		"--storage-driver=vfs",
-		"--platform",
-		task.Platform,
-		"--pull-always",
-		"-f",
-		"Dockerfile",
-		"-t",
-		task.Image,
-		".",
+	bud := []string{}
+
+	if task.Platform != "" {
+		bud = []string{
+			"buildah",
+			"bud",
+			"--storage-driver=vfs",
+			"--platform",
+			task.Platform,
+			"--pull-always",
+			"-f",
+			"Dockerfile",
+			"-t",
+			task.Image,
+			".",
+		}
+	} else {
+		bud = []string{
+			"buildah",
+			"bud",
+			"--storage-driver=vfs",
+			"--pull-always",
+			"-f",
+			"Dockerfile",
+			"-t",
+			task.Image,
+			".",
+		}
 	}
 
 	push := []string{

pkg/trait/builder.go

@@ -27,7 +27,6 @@ import (
 	"github.com/apache/camel-k/pkg/builder"
 	mvn "github.com/apache/camel-k/pkg/util/maven"
 	"github.com/apache/camel-k/pkg/util/property"
-	"github.com/containerd/containerd/platforms"
 )
 
 // The builder trait is internally used to determine the best strategy to
@@ -105,7 +104,7 @@ func (t *builderTrait) Apply(e *Environment) error {
 		var platform string
 		var found bool
 		if platform, found = e.Platform.Status.Build.PublishStrategyOptions[builder.BuildahPlatform]; !found {
-			platform = platforms.DefaultSpec().OS + "/" + platforms.DefaultSpec().Architecture + "/" + platforms.DefaultSpec().Variant
+			platform = ""
 		}
 
 		e.BuildTasks = append(e.BuildTasks, v1.Task{Buildah: &v1.BuildahTask{

pkg/util/defaults/defaults.go

@@ -35,7 +35,7 @@ const (
 	KanikoVersion = "0.17.1"
 
 	// baseImage --
-	baseImage = "docker.io/adoptopenjdk/openjdk11:slim"
+	baseImage = "adoptopenjdk/openjdk11:slim"
 
 	// LocalRepository --
 	LocalRepository = "/tmp/artifacts/m2"

script/Makefile

@@ -29,7 +29,6 @@ OPM_VERSION := v1.21.0
 BASE_IMAGE := docker.io/adoptopenjdk/openjdk11:slim
 LOCAL_REPOSITORY := /tmp/artifacts/m2
 IMAGE_NAME := docker.io/apache/camel-k
-IMAGE_TARGET_PLATFORM := linux/amd64
 
 #
 # Situations when user wants to override
@@ -91,15 +90,6 @@ TEST_PREBUILD = build
 #GOLDFLAGS += -X github.com/apache/camel-k/pkg/util/olm.DefaultStartingCSV=
 #GOLDFLAGS += -X github.com/apache/camel-k/pkg/util/olm.DefaultGlobalNamespace=openshift-operators
 
-# Define target platform for docker build
-ifeq ($(shell uname -m), x86_x64)
-IMAGE_TARGET_PLATFORM = linux/amd64
-endif
-
-ifeq ($(shell uname -m), aarch64)
-IMAGE_TARGET_PLATFORM = linux/arm64
-endif
-
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -341,6 +331,16 @@ endif
 	docker build -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile .
 
 images-arch: bundle-kamelets test maven-overlay
+IMAGE_TARGET_PLATFORM := linux/amd64
+# Define target platform for docker build
+ifeq ($(shell uname -m), x86_x64)
+	IMAGE_TARGET_PLATFORM = linux/amd64
+endif
+
+ifeq ($(shell uname -m), aarch64)
+	IMAGE_TARGET_PLATFORM = linux/arm64
+endif
+
 	mkdir -p build/_maven_output
 	mkdir -p build/_output/bin
 ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
@@ -363,6 +363,16 @@ endif
 	docker build -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile .
 
 images-arch-dev: bundle-kamelets test package-artifacts maven-overlay
+IMAGE_TARGET_PLATFORM := linux/amd64
+# Define target platform for docker build
+ifeq ($(shell uname -m), x86_x64)
+	IMAGE_TARGET_PLATFORM = linux/amd64
+endif
+
+ifeq ($(shell uname -m), aarch64)
+	IMAGE_TARGET_PLATFORM = linux/arm64
+endif
+
 	mkdir -p build/_maven_output
 	mkdir -p build/_output/bin
 ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
@@ -581,9 +591,3 @@ endif
 # Build the bundle image.
 bundle-build: bundle
 	cd bundle && docker build -f Dockerfile -t $(BUNDLE_IMAGE_NAME) .
-
-# Build the bundle image.
-bundle-build-arch: bundle
-	docker buildx rm --all-inactive --force
-	docker buildx create --append --name builder
-	cd bundle && docker buildx build --platform=$(IMAGE_TARGET_PLATFORM) -f Dockerfile.arch -t $(BUNDLE_IMAGE_NAME) .