Merge branch 'devfile:main' into multi-arch-release

.ci/common.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

.ci/oci-devworkspace-happy-path.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

.ci/oci.Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

.ci/openshift_e2e.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Global Owners
-* @amisevsk @AObuchow @l0rd
+* @amisevsk @AObuchow @ibuziuk

.github/workflows/devtools-image-build.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

.github/workflows/next-build.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -31,6 +31,12 @@ jobs:
       git-sha: ${{ steps.git-sha.outputs.sha }}
 
     steps:
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Checkout devworkspace-operator source code
       uses: actions/checkout@v3
 
@@ -50,6 +56,7 @@ jobs:
       with:
         context: .
         push: true
+        platforms: linux/amd64, linux/arm64, linux/ppc64le, linux/s390x
         tags: |
           quay.io/devfile/devworkspace-controller:next
           quay.io/devfile/devworkspace-controller:sha-${{ steps.git-sha.outputs.sha }}
@@ -60,6 +67,7 @@ jobs:
       with:
         context: .
         push: true
+        platforms: linux/amd64, linux/arm64, linux/ppc64le, linux/s390x
         tags: |
           quay.io/devfile/project-clone:next
           quay.io/devfile/project-clone:sha-${{ steps.git-sha.outputs.sha }}
@@ -175,6 +183,7 @@ jobs:
             --bundle-tag ${DWO_BUNDLE_TAG} \
             --index-image ${DWO_INDEX_IMG} \
             --container-tool docker \
+            --multi-arch \
             --debug \
             --force
 
@@ -185,11 +194,13 @@ jobs:
             --render ./olm-catalog/next-digest/ \
             --push "${DWO_BUNDLE_REPO}:${DWO_DIGEST_BUNDLE_TAG}" \
             --container-tool docker \
+            --multi-arch \
             --debug
 
           cp ./olm-catalog/next/{channel,package}.yaml ./olm-catalog/next-digest
-          docker build . -t ${DWO_DIGEST_INDEX_IMG} -f build/index.next-digest.Dockerfile
-          docker push ${DWO_DIGEST_INDEX_IMG}
+          docker buildx build . -t ${DWO_DIGEST_INDEX_IMG} -f build/index.next-digest.Dockerfile \
+          --platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x \
+          --push
 
           git restore ./olm-catalog/
           git clean -fd ./olm-catalog/

Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

OWNERS

@@ -1,5 +1,7 @@
 reviewers:
   - amisevsk
+  - AObuchow
 approvers:
   - amisevsk
+  - AObuchow
 component: DevWorkspace Operator

apis/controller/v1alpha1/attributes.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/common.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/devfile.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/devworkspacerouting_types.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/doc.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/errors.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

apis/controller/v1alpha1/groupversion_info.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

build/Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

build/buildkitd.toml

@@ -0,0 +1,2 @@
+[worker.oci]
+  max-parallelism = 1

build/devtools.Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

build/make/olm.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

build/scripts/build_digests_bundle.sh

@@ -3,8 +3,12 @@
 set -eo pipefail
 
 PODMAN=podman
+MULTI_ARCH="false"
+ARCHITECTURES="linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
 SCRIPT_DIR=$(cd "$(dirname "$0")" || exit; pwd)
 
+DEFAULT_BUILDER_NAME="dwo-multi-platform-builder"
+
 usage() {
   cat <<EOF
 This script converts a operator bundle image that may have images referred to by
@@ -20,6 +24,8 @@ Arguments:
   --push <IMAGE>          : Push processed digests bundle to <IMAGE> (required). Pushing the bundle image to a
                             repository is required because opm render works from a remote repository.
   --container-tool <TOOL> : Use specific container tool for building/pushing images (default: use podman).
+  --multi-arch            : Create images for the following architectures: $ARCHITECTURES. Note: Docker buildx will be
+                            used for building and pushing the images, instead of the container tool selected with --container-tool.
   --debug, -d             : Print debug information.
   --help, -h              : Show this message.
 EOF
@@ -51,6 +57,7 @@ parse_args() {
       '--render') RENDER="$2"; shift;;
       '--push') PUSH_IMAGE="$2"; shift;;
       '--container-tool') PODMAN="$2"; shift;;
+      '--multi-arch') MULTI_ARCH="true";;
       '-d'|'--debug') DEBUG="true";;
       '-h'|'--help') usage; exit 0;;
       *) error "Unknown parameter is used: $1."; usage; exit 1;;
@@ -81,6 +88,19 @@ preflight() {
 parse_args "$@"
 preflight
 
+if [ "$MULTI_ARCH" == "true" ]; then
+  # Create a multi-arch builder if one doesn't already exist
+  BUILDER_EXISTS=0
+  docker buildx use "$DEFAULT_BUILDER_NAME" || BUILDER_EXISTS=$?
+
+  if [ $BUILDER_EXISTS -eq 0 ]; then
+    echo "Using $DEFAULT_BUILDER_NAME for build"
+  else
+    echo "Setting up Docker buildx builder:"
+    docker buildx create --name "$DEFAULT_BUILDER_NAME" --driver docker-container --config build/buildkitd.toml --use
+  fi
+fi
+
 # Work in a temporary directory
 TMPDIR="$(mktemp -d)"
 info "Working in $TMPDIR"
@@ -125,10 +145,17 @@ if [ "$DEBUG" == true ]; then
   cat "${PROCESSED_DIR}/bundle.Dockerfile" | sed 's|^|        |g'
 fi
 
-info "Building bundle $PUSH_IMAGE"
-$PODMAN build -t "$PUSH_IMAGE" -f "${PROCESSED_DIR}/bundle.Dockerfile" "$PROCESSED_DIR" | sed 's|^|        |g'
-info "Pushing bundle $PUSH_IMAGE"
-$PODMAN push "$PUSH_IMAGE" 2>&1 | sed 's|^|        |g'
+if [ "$MULTI_ARCH" == "true" ]; then
+  info "Building and pushing bundle $PUSH_IMAGE"
+  docker buildx build -t "$PUSH_IMAGE" -f "${PROCESSED_DIR}/bundle.Dockerfile" "$PROCESSED_DIR" \
+  --platform "$ARCHITECTURES" \
+  --push 2>&1 | sed 's|^|        |g'
+else
+  info "Building bundle $PUSH_IMAGE"
+  $PODMAN build -t "$PUSH_IMAGE" -f "${PROCESSED_DIR}/bundle.Dockerfile" "$PROCESSED_DIR" | sed 's|^|        |g'
+  info "Pushing bundle $PUSH_IMAGE"
+  $PODMAN push "$PUSH_IMAGE" 2>&1 | sed 's|^|        |g'
+fi
 
 NEW_BUNDLE_SHA=$(skopeo inspect "docker://${PUSH_IMAGE}" | jq -r '.Digest')
 NEW_BUNDLE_DIGEST="${PUSH_IMAGE%%:*}@${NEW_BUNDLE_SHA}"

build/scripts/build_index_image.sh

@@ -4,12 +4,15 @@ set -e
 
 PODMAN=podman
 FORCE="false"
+MULTI_ARCH="false"
+ARCHITECTURES="linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
 DEBUG="false"
 
 DEFAULT_BUNDLE_REPO="quay.io/devfile/devworkspace-operator-bundle"
 DEFAULT_BUNDLE_TAG="next"
 DEFAULT_INDEX_IMAGE="quay.io/devfile/devworkspace-operator-index:next"
 DEFAULT_RELEASE_INDEX_IMAGE="quay.io/devfile/devworkspace-operator-index:release"
+DEFAULT_BUILDER_NAME="dwo-multi-platform-builder"
 
 error() {
   echo "[ERROR] $1"
@@ -36,6 +39,9 @@ Arguments:
   --container-tool <TOOL> : Use specific container tool for building/pushing images (default: use podman)
   --force                 : Do not prompt for confirmation if pushing to default repos. Intended for
                             use in CI.
+  --multi-arch            : Create images for the following architectures: $ARCHITECTURES. Note: Docker
+                            buildx will be used for building and pushing the images, instead of
+                            the container tool selected with --container-tool.
   --debug                 : Don't do any normal cleanup on exit, leaving repo in dirty state
 
 Examples:
@@ -56,6 +62,7 @@ parse_args() {
       '--container-tool') PODMAN="$2"; shift 1;;
       '--release') RELEASE="true";;
       '--force') FORCE="true";;
+      '--multi-arch') MULTI_ARCH="true";;
       '--debug') DEBUG="true";;
       *) echo "[ERROR] Unknown parameter is used: $1."; usage; exit 1;;
     esac
@@ -65,6 +72,19 @@ parse_args() {
 
 parse_args "$@"
 
+if [ "$MULTI_ARCH" == "true" ]; then
+  # Create a multi-arch builder if one doesn't already exist
+  BUILDER_EXISTS=0
+  docker buildx use "$DEFAULT_BUILDER_NAME" || BUILDER_EXISTS=$?
+
+  if [ $BUILDER_EXISTS -eq 0 ]; then
+    echo "Using $DEFAULT_BUILDER_NAME for build"
+  else
+    echo "Setting up Docker buildx builder:"
+    docker buildx create --name "$DEFAULT_BUILDER_NAME" --driver docker-container --config build/buildkitd.toml --use
+  fi
+fi
+
 if [ "$RELEASE" == "true" ]; then
   # Set up for release and check arguments
   BUNDLE_REPO="${BUNDLE_REPO:-DEFAULT_BUNDLE_REPO}"
@@ -118,8 +138,15 @@ fi
 make generate_olm_bundle_yaml
 
 echo "Building bundle image $BUNDLE_IMAGE"
-$PODMAN build . -t "$BUNDLE_IMAGE" -f build/bundle.Dockerfile
-$PODMAN push "$BUNDLE_IMAGE" 2>&1
+if [ "$MULTI_ARCH" == "true" ]; then
+  docker buildx build . -t "$BUNDLE_IMAGE" -f build/bundle.Dockerfile \
+  --platform "$ARCHITECTURES" \
+  --push
+else
+  $PODMAN build . -t "$BUNDLE_IMAGE" -f build/bundle.Dockerfile
+  $PODMAN push "$BUNDLE_IMAGE" 2>&1
+fi
+
 
 BUNDLE_SHA=$(skopeo inspect "docker://${BUNDLE_IMAGE}" | jq -r '.Digest')
 BUNDLE_DIGEST="${BUNDLE_REPO}@${BUNDLE_SHA}"
@@ -177,8 +204,15 @@ opm validate "$OUTDIR"
 
 # Build index container
 echo "Building index image $INDEX_IMAGE"
-$PODMAN build . -t "$INDEX_IMAGE" -f "$DOCKERFILE"
-$PODMAN push "$INDEX_IMAGE" 2>&1
+if [ "$MULTI_ARCH" == "true" ]; then
+  docker buildx build . -t "$INDEX_IMAGE" -f "$DOCKERFILE" \
+  --platform "$ARCHITECTURES" \
+  --push
+else
+  $PODMAN build . -t "$INDEX_IMAGE" -f "$DOCKERFILE"
+  $PODMAN push "$INDEX_IMAGE" 2>&1
+fi
+
 
 if [ $DEBUG != "true" ] && [ "$RELEASE" != "true" ]; then
   echo "Cleaning up"

build/scripts/generate_deployment.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019-2023 Red Hat, Inc.
+# Copyright (c) 2019-2024 Red Hat, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

controllers/controller/devworkspacerouting/conversion/conversion.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

controllers/controller/devworkspacerouting/devworkspacerouting_controller_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

controllers/controller/devworkspacerouting/predicates.go

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at