fix: ARM images #332

mateusoliveira43 · 2024-07-29T16:47:48Z

Add ARM images to PROW CI

Example image: https://quay.io/repository/msouzaol/velero

How to build

docker build -t <TAG> -f Dockerfile.ubi . --platform=linux/arm64

Signed-off-by: Mateus Oliveira <[email protected]>

openshift-ci · 2024-07-29T16:47:53Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Signed-off-by: Mateus Oliveira <[email protected]>

openshift-ci · 2024-08-05T16:13:25Z

@mateusoliveira43: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

kaovilai · 2024-08-05T17:52:20Z

Dockerfile-velero-restore-helper.ubi

@@ -1,10 +1,16 @@
-FROM quay.io/konveyor/builder:latest AS builder
+FROM quay.io/konveyor/builder:ubi9-latest AS builder


Suggested change

FROM quay.io/konveyor/builder:ubi9-latest AS builder

FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder

ARG BUILDPLATFORM

Since we are optimizing, and golang can cross compile binary, and this is not the final stage, we can set BUILDPLATFORM to get more optimum performance.

ref: cross-compilation

but this would make only multi platform builds faster, not?

since multi platform builds are CI responsibility (and I do not know how PROW does it), I think we do not need this

right do not need. but doesn't hurt to add for local dev builds either when building for dev/customers who are on arch other than the dev machine.

im on arm, so this would speed up builds of amd64 images to use on amd64 cluster.

This would make single platform build faster if the OS building (ie. laptop is arm64) is different than intended image platform (for amd64 cluster)

kaovilai · 2024-08-05T17:53:15Z

Dockerfile.ubi

@@ -1,18 +1,29 @@
-# TODO! Find a real ubi8 image for golang 1.16
 FROM quay.io/konveyor/builder:ubi9-latest AS builder


Suggested change

FROM quay.io/konveyor/builder:ubi9-latest AS builder

FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder

ARG BUILDPLATFORM

kaovilai · 2024-08-05T17:54:03Z

Dockerfile.ubi

+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=konveyor-dev' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper

 FROM quay.io/konveyor/builder:ubi9-latest AS restic-builder


Suggested change

FROM quay.io/konveyor/builder:ubi9-latest AS restic-builder

FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS restic-builder

ARG BUILDPLATFORM

weshayutin

/LGTM

mateusoliveira43 · 2024-08-06T16:54:47Z

/cherry-pick oadp-1.4

openshift-cherrypick-robot · 2024-08-06T16:54:50Z

@mateusoliveira43: once the present PR merges, I will cherry-pick it on top of oadp-1.4 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick oadp-1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci · 2024-08-06T17:08:40Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: kaovilai, mateusoliveira43, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

DOWNSTREAM_OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-cherrypick-robot · 2024-08-06T17:12:20Z

@mateusoliveira43: #332 failed to apply on top of branch "oadp-1.4":

Applying: fix: ARM images
Using index info to reconstruct a base tree...
M	Dockerfile.ubi
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.ubi
CONFLICT (content): Merge conflict in Dockerfile.ubi
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: ARM images
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick oadp-1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

* fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> * fixup! fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> --------- Signed-off-by: Mateus Oliveira <[email protected]> (cherry picked from commit 41ad312)

* fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> * fixup! fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> --------- Signed-off-by: Mateus Oliveira <[email protected]>

* Issue vmware-tanzu#8772 ensure pv removed (vmware-tanzu#8777) * ensure pv has been deleted Signed-off-by: Roger Zimmermann <[email protected]> * ensure delete pv unit test Signed-off-by: Roger Zimmermann <[email protected]> * comment, errors Signed-off-by: Roger Zimmermann <[email protected]> * updated changelog Signed-off-by: Roger Zimmermann <[email protected]> Signed-off-by: Roger Zimmermann <[email protected]> * pass value Co-authored-by: Tiger Kaovilai <[email protected]> Signed-off-by: Roger Zimmermann <[email protected]> * function renamed as suggested Signed-off-by: Roger Zimmermann <[email protected]> --------- Signed-off-by: Roger Zimmermann <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> * issue8720: log doesn't show pv name (vmware-tanzu#8771) * fix: log doesn't show pv name Signed-off-by: hu-keyu <[email protected]> * fix: add changelog Signed-off-by: hu-keyu <[email protected]> * update changelog fileName Signed-off-by: hu-keyu <[email protected]> --------- Signed-off-by: hu-keyu <[email protected]> * Bump kind cli to v0.27.0 (vmware-tanzu#8699) Signed-off-by: Tiger Kaovilai <[email protected]> * Modify how the restore workflow using the resource name. The restore workflow used name represents the backup resource and the restore to be restored, but the restored resource name may be different from the backup one, e.g. PV and VSC are global resources, to avoid conflict, need to rename them. Reanme the name variable to backupResourceName, and use obj.GetName() for restore operation. Signed-off-by: Xun Jiang <[email protected]> * Enable containerdv2 images Fixes vmware-tanzu#8648 Signed-off-by: Tiger Kaovilai <[email protected]> * Bump github.com/golang-jwt/jwt/v5 from 5.2.1 to 5.2.2 (vmware-tanzu#8806) Bumps [github.com/golang-jwt/jwt/v5](https://github.com/golang-jwt/jwt) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md) - [Commits](golang-jwt/jwt@v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: github.com/golang-jwt/jwt/v5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Document schedule skipImmediately (vmware-tanzu#8802) Fixes vmware-tanzu#8787 Signed-off-by: Tiger Kaovilai <[email protected]> * issue 8803: use deterministic name to create backupRepository Signed-off-by: Lyndon-Li <[email protected]> * add third party annotation support for maintenance job Signed-off-by: Lyndon-Li <[email protected]> * Bump the golang.org/x/net to v0.36.0 to fix Restic CVE. Signed-off-by: Xun Jiang <[email protected]> * update readme and implemented design for 1.16 Signed-off-by: Lyndon-Li <[email protected]> * add doc for upgrade to 1.16 Signed-off-by: Lyndon-Li <[email protected]> * add 1.16 doc Signed-off-by: Lyndon-Li <[email protected]> * Fix the non data mover migration failure. Migration cases use the Kibishii as the workload, and SC mapping ConfigMap was needed for all scenarios, because standby cluster doesn't have the Kibishii SC after setting up. Signed-off-by: Xun Jiang <[email protected]> * add 1.16 changelog Signed-off-by: Lyndon-Li <[email protected]> * Bump the migration and upgrade E2E test source version. Add v1.16 related plugin and other image default version. Signed-off-by: Xun Jiang <[email protected]> * Align the E2E upgrade test's CLI and image version. Signed-off-by: Xun Jiang <[email protected]> * pin velero image Signed-off-by: Lyndon-Li <[email protected]> * skip subresource in resource discovery (vmware-tanzu#6688) Signed-off-by: lou <[email protected]> Co-authored-by: lou <[email protected]> * fix issue 6753 Signed-off-by: Lyndon-Li <[email protected]> * Update restore controller logic for restore deletion (vmware-tanzu#6761) 1. Skip deleting the restore files from storage if the backup/BSL is not found 2. Allow deleting the restore files from storage even though the BSL is readonly Signed-off-by: Wenkai Yin(尹文开) <[email protected]> * Fix vmware-tanzu#6752: add namespace exclude check. Add PSA audit and warn labels. Signed-off-by: Xun Jiang <[email protected]> * add csi snapshot data movement doc Signed-off-by: Lyndon-Li <[email protected]> * Modify changelogs for v1.12 Signed-off-by: allenxu404 <[email protected]> * issue 6786:always delete VSC regardless of the deletion policy Signed-off-by: Lyndon-Li <[email protected]> * issue: move plugin depdending podvolume functions to util pkg Signed-off-by: Lyndon-Li <[email protected]> * issue 6880: set ParallelUploadAboveSize as MaxInt64 Signed-off-by: Lyndon-Li <[email protected]> * changelog Signed-off-by: Tiger Kaovilai <[email protected]> * Add support for block volumes (vmware-tanzu#6680) (vmware-tanzu#6897) (cherry picked from commit 8e01d1b) Signed-off-by: David Zaninovic <[email protected]> * Replace the base image with paketobuildpacks image Replace the base image with paketobuildpacks image Fixes vmware-tanzu#6851 Signed-off-by: Wenkai Yin(尹文开) <[email protected]> * issue 6734: spread backup pod evenly Signed-off-by: Lyndon-Li <[email protected]> * Add doc links for new features to release note Signed-off-by: allenxu404 <[email protected]> * fix issue 6647 Signed-off-by: Lyndon-Li <[email protected]> * Perf improvements for existing resource restore Use informer cache with dynamic client for Get calls on restore When enabled, also make the Get call before create. Add server and install parameter to allow disabling this feature, but enable by default Signed-off-by: Scott Seago <[email protected]> * issue vmware-tanzu#6807: Retry failed create when using generateName When creating resources with generateName, apimachinery does not guarantee uniqueness when it appends the random suffix to the generateName stub, so if it fails with already exists error, we need to retry. Signed-off-by: Scott Seago <[email protected]> * Import auth provider plugins Signed-off-by: Sebastian Glab <[email protected]> * Add v1.12.1 changelog Signed-off-by: allenxu404 <[email protected]> * Make Windows build skip BlockMode code. PVC block mode backup and restore introduced some OS specific system calls. Those calls are not available for Windows, so add both non Windows version and Windows version code, and return error for block mode on the Windows platform. Signed-off-by: Xun Jiang <[email protected]> * udmrepo use region specified in BSL when s3URL is empty Signed-off-by: Lyndon-Li <[email protected]> * Change v1.12.1 changelog Signed-off-by: allenxu404 <[email protected]> * Dockerfile.ubi/travis local files add UBI dockerfiles Use numeric user for velero-restic-restore-helper Enable multiarch builds (#135) Use arm64-graviton2 for arm builds (#137) Add required keys for arm builds (#139) Update Travis build job to work w/o changes on new branches Use a full VM for arm Use numeric non-root user for nonroot SCC compatibility * Add BZ + Publish automation to repo (#82) (cherry picked from commit ccb545f) Update PR-BZ automation mapping (#84) (cherry picked from commit aa2b019) Update PR-BZ automation (#92) Co-authored-by: Rayford Johnson <[email protected]> (cherry picked from commit ecc563f) Add publish workflow (#108) (cherry picked from commit f87b779) * remove dependabot config from fork * Create Makefile.prow Code-gen no longer required on verify due to vmware-tanzu#6039 Signed-off-by: Tiger Kaovilai <[email protected]> oadp-1.2: Update Makefile.prow to velero-restore-helper * set HOME in velero image for kopia, update controller-gen for CI (#280) Signed-off-by: Scott Seago <[email protected]> * build velero-helper binary for datamover pod * restore: Use warning when Create IsAlreadyExist and Get error Signed-off-by: Tiger Kaovilai <[email protected]> * kopia/repository/config/aws.go: Set session.Options profile from config Signed-off-by: Tiger Kaovilai <[email protected]> * use ubi9-latest to build * OADP-4225: add tzdata to Dockerfile.ubi * fix: CI (#316) Signed-off-by: Mateus Oliveira <[email protected]> * fix: ARM images (#332) * fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> * fixup! fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> --------- Signed-off-by: Mateus Oliveira <[email protected]> * ubi: BUILDPLATFORM to build stage to enable cross compile. (#336) Signed-off-by: Tiger Kaovilai <[email protected]> * OADP-4640: Downstream only to allow override kopia default algorithms (#334) (#338) add missing unit test for kopia hashing algo (#337) Introduction of downstream only option to override Kopia default: - hashing algorithm - splitting algorithm - encryption algorithm With introduction of 3 environment variables it is possible to override Kopia algorithms used by Velero: KOPIA_HASHING_ALGORITHM KOPIA_SPLITTER_ALGORITHM KOPIA_ENCRYPTION_ALGORITHM If the env algorithms are not set or they are not within Kopia SupportedAlgorithms, the default algorithm will be used. This behavior is consistent with current behavior without this change. Signed-off-by: Michal Pryc <[email protected]> Signed-off-by: Shubham Pampattiwar <[email protected]> * Downstream only: Rework of Makefile and incusion of lint The rework of Makefile to make it more readable and inclusion of lint as a target as well extract golangci-lint version from the upstream Dockerfile, so we test in PROW or locally on the same version as upstream. Signed-off-by: Michal Pryc <[email protected]> * Downstream only - fix lint error in downtream change (#343) This fixes the PR #334 where one additional line was in the code. This was not exposed previously as we did not had downstream CI Lint jobs. Signed-off-by: Michal Pryc <[email protected]> * run oadp-operator e2e test from the velero repo (#353) * run oadp-operator e2e test from the velero repo execute openshift/oadp-operator e2e tests directly against the velero repo locally or via prow ci Signed-off-by: Wesley Hayutin <[email protected]> * update variable names, add a cleanup * make sure env variable overrides default velero_image Signed-off-by: Wesley Hayutin <[email protected]> * add options to build, push, and only test Signed-off-by: Wesley Hayutin <[email protected]> * add arch to name Signed-off-by: Wesley Hayutin <[email protected]> * remove duplicated clean/rm operator checkout * simplify by dropping export var and use a oneliner Co-authored-by: Tiger Kaovilai <[email protected]> * drop export and use oneliner Co-authored-by: Tiger Kaovilai <[email protected]> * just in case, allow oadp to be deployed from makefile Signed-off-by: Wesley Hayutin <[email protected]> * Update Makefile.prow Co-authored-by: Tiger Kaovilai <[email protected]> --------- Signed-off-by: Wesley Hayutin <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> * DS Owners * updated controller-gen version * Include velero-restore-helper binary in velero image (#375) Co-authored-by: Scott Seago <[email protected]> --------- Signed-off-by: Roger Zimmermann <[email protected]> Signed-off-by: hu-keyu <[email protected]> Signed-off-by: Tiger Kaovilai <[email protected]> Signed-off-by: Xun Jiang <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Lyndon-Li <[email protected]> Signed-off-by: lou <[email protected]> Signed-off-by: Wenkai Yin(尹文开) <[email protected]> Signed-off-by: Xun Jiang <[email protected]> Signed-off-by: allenxu404 <[email protected]> Signed-off-by: David Zaninovic <[email protected]> Signed-off-by: Scott Seago <[email protected]> Signed-off-by: Sebastian Glab <[email protected]> Signed-off-by: Mateus Oliveira <[email protected]> Signed-off-by: Michal Pryc <[email protected]> Signed-off-by: Shubham Pampattiwar <[email protected]> Signed-off-by: Wesley Hayutin <[email protected]> Co-authored-by: Roger Zimmermann <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: hu-keyu <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: Xun Jiang <[email protected]> Co-authored-by: lyndon-li <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wenkai Yin(尹文开) <[email protected]> Co-authored-by: Lyndon-Li <[email protected]> Co-authored-by: Xun Jiang/Bruce Jiang <[email protected]> Co-authored-by: Daniel Jiang <[email protected]> Co-authored-by: lou <[email protected]> Co-authored-by: Xun Jiang <[email protected]> Co-authored-by: allenxu404 <[email protected]> Co-authored-by: David Zaninovic <[email protected]> Co-authored-by: Sebastian Glab <[email protected]> Co-authored-by: Dylan Murray <[email protected]> Co-authored-by: RayfordJ <[email protected]> Co-authored-by: Mateus Oliveira <[email protected]> Co-authored-by: Michal Pryc <[email protected]> Co-authored-by: Wesley Hayutin <[email protected]> Co-authored-by: OpenShift Cherrypick Robot <[email protected]>

* fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> * fixup! fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> --------- Signed-off-by: Mateus Oliveira <[email protected]>

fix: ARM images

7a0c103

Signed-off-by: Mateus Oliveira <[email protected]>

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 29, 2024

fixup! fix: ARM images

4e82922

Signed-off-by: Mateus Oliveira <[email protected]>

mateusoliveira43 marked this pull request as ready for review August 5, 2024 16:06

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 5, 2024

kaovilai reviewed Aug 5, 2024

View reviewed changes

weshayutin approved these changes Aug 6, 2024

View reviewed changes

openshift-ci bot assigned weshayutin Aug 6, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2024

kaovilai approved these changes Aug 6, 2024

View reviewed changes

kaovilai added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2024

openshift-merge-bot bot merged commit 41ad312 into openshift:konveyor-dev Aug 6, 2024

mateusoliveira43 mentioned this pull request Aug 6, 2024

[oadp-1.4] fix: ARM images #335

Merged

		@@ -1,10 +1,16 @@
		FROM quay.io/konveyor/builder:latest AS builder
		FROM quay.io/konveyor/builder:ubi9-latest AS builder

	FROM quay.io/konveyor/builder:ubi9-latest AS builder
	FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder
	ARG BUILDPLATFORM

		@@ -1,18 +1,29 @@
		# TODO! Find a real ubi8 image for golang 1.16
		FROM quay.io/konveyor/builder:ubi9-latest AS builder

fix: ARM images #332

fix: ARM images #332

Uh oh!

Conversation

mateusoliveira43 commented Jul 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to build

Uh oh!

openshift-ci bot commented Jul 29, 2024

Uh oh!

openshift-ci bot commented Aug 5, 2024

Uh oh!

kaovilai Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mateusoliveira43 Aug 6, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 6, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 6, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

weshayutin left a comment

Choose a reason for hiding this comment

Uh oh!

mateusoliveira43 commented Aug 6, 2024

Uh oh!

openshift-cherrypick-robot commented Aug 6, 2024

Uh oh!

openshift-ci bot commented Aug 6, 2024

Uh oh!

openshift-cherrypick-robot commented Aug 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mateusoliveira43 commented Jul 29, 2024 •

edited

Loading

kaovilai Aug 5, 2024 •

edited

Loading

kaovilai Aug 6, 2024 •

edited

Loading

kaovilai Aug 5, 2024 •

edited

Loading

kaovilai Aug 5, 2024 •

edited

Loading