Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prow: build images for arm64 #22362

Merged
merged 3 commits into from
Jul 8, 2021
Merged

Conversation

LorbusChris
Copy link
Contributor

@LorbusChris LorbusChris commented May 27, 2021

With this commit, a minmal prow payload for arm64 can be built.
The payload only contains the following four images which are
the minimal requirements for scheduling Prow builds on an arm64 build
farm:

  • clonerefs
  • entrypoint
  • initupload
  • sidecar

The image will be tagged as before but with an additional -arm64 suffix.

Blocked on: #22450

/cc @stevekuznetsov

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 27, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @LorbusChris!

It looks like this is your first PR to kubernetes/test-infra 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/test-infra has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @LorbusChris. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/prow Issues or PRs related to prow size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels May 27, 2021
@LorbusChris LorbusChris changed the title prow: Build images for arm64 prow: build images for arm64 May 27, 2021
@alvaroaleman
Copy link
Member

/cc @fejta @chaodaiG

@alvaroaleman
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 27, 2021
prow/Makefile Outdated Show resolved Hide resolved
@fejta
Copy link
Contributor

fejta commented May 27, 2021

Right now rules_docker does not have the ability to produce multi-platform images, so we'll either need to pull in the ability to do this, use different tags for other architectures, or something else.

bazelbuild/rules_docker#1688
bazelbuild/rules_docker#1599

@k8s-ci-robot k8s-ci-robot added area/prow/clonerefs Issues or PRs related to prow's clonerefs component area/prow/entrypoint Issues or PRs related to prow's entrypoint component area/prow/initupload Issues or PRs related to prow's initupload component area/prow/pod-utilities Issues or PRs related to prow's pod-utilities component area/prow/sidecar Issues or PRs related to prow's sidecar component size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 10, 2021
@LorbusChris LorbusChris force-pushed the prow-arm64 branch 6 times, most recently from 2ad3fa9 to d715b77 Compare June 10, 2021 17:16
@LorbusChris
Copy link
Contributor Author

the second commit currently contains a reference to a one-off rebuild of the git image. It should be replaced by a properly automated build from #22450
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 10, 2021
prow/def.bzl Outdated
stamp = True, # stamp by default, but allow overrides
app_name = "app",
**kwargs):
go_image(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there some important reason we need both prow_image and prow_image_arm64 macros?

It would be nice to just add these two go_image and container_image calls to the prow_image macro, potentially gated by an declare_arm = False macro which we can set to true for the handful of places you want to use it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reasoning was that having arm images might not be required for everyone, and this way one can make them separately.
I'm not married to doing it this way, but I'd like to hear @stevekuznetsov's thoughts on this, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gating via some bool on the macro would achieve the same, though. I'll go ahead and make the change.

prow/BUILD.bazel Outdated
prow_push(
name = "release-push-arm64",
bundle_name = "release-arm64",
images = tags_arm64(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about just adding this to release-push images argument?

This commit updates the `git-base` to tag `v20210618-1017135`,
and also adds a `git-base-arm64` image  from the same manifest.
@LorbusChris LorbusChris force-pushed the prow-arm64 branch 5 times, most recently from 276e5a9 to d688f81 Compare July 6, 2021 14:16
The arm64 payload only contains the following four images which are
the minimal requirements for scheduling Prow builds on an arm64 build
farm:
- clonerefs
- entrypoint
- initupload
- sidecar

The arm64 images will be tagged with an additional `-arm64` suffix.
@LorbusChris
Copy link
Contributor Author

@fejta I've updated the macro per your review. Please take another look

Copy link
Contributor

@fejta fejta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks really great! Thanks for all the work here.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fejta, LorbusChris

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2021
@LorbusChris
Copy link
Contributor Author

great, thanks for the review!
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2021
@k8s-ci-robot k8s-ci-robot merged commit c482ea2 into kubernetes:master Jul 8, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jul 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/prow/clonerefs Issues or PRs related to prow's clonerefs component area/prow/entrypoint Issues or PRs related to prow's entrypoint component area/prow/initupload Issues or PRs related to prow's initupload component area/prow/pod-utilities Issues or PRs related to prow's pod-utilities component area/prow/sidecar Issues or PRs related to prow's sidecar component area/prow Issues or PRs related to prow cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants