images/git: Build for arm64 #22450

LorbusChris · 2021-06-07T16:14:53Z

This commit adds a Google Cloud Build definition for building git
arm64 images and pushing them as a manifest list together with their
amd64 counterparts.

This is a prereq for #16588 and #22362

~~Blocked on: #22599 #22444~~

/cc @stevekuznetsov

k8s-ci-robot · 2021-06-07T16:15:01Z

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.

alvaroaleman

/ok-to-test

(but I can't speak for the correctness of the change itself)

LorbusChris · 2021-06-07T20:31:41Z

If someone with knowledge of Google Cloud Build could take a look that'd be great :)

LorbusChris · 2021-06-08T14:32:14Z

/cc @BenTheElder

LorbusChris · 2021-06-09T12:07:19Z

looking at the file history, @fejta might be best suited for a review of these changes.
/cc @fejta
/uncc @BenTheElder

Requires: kubernetes#22450

spiffxp · 2021-06-10T15:57:03Z

/cc

spiffxp · 2021-06-10T16:02:12Z

Testing without bazel or pushing to k8s-testimages

$ go install ./images/builder
$ builder --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/git

/hold
looks like your change doesn't quite work

Step #0: Successfully built 142bd5110560
Step #0: Successfully tagged gcr.io/k8s-staging-test-infra/git:v20210610-b2adebc132
Finished Step #0
Starting Step #1
Step #1: Already have image (with digest): gcr.io/cloud-builders/docker
Step #1: Sending build context to Docker daemon  31.23kB
Step #1: Step 1/4 : FROM gcr.io/k8s-prow/alpine:v20200605-44f6c96
Step #1:  ---> 828d3cee2013
Step #1: Step 2/4 : ARG IMAGE_ARG
Step #1:  ---> Using cache
Step #1:  ---> a3e8ba8fdf41
Step #1: Step 3/4 : ENV IMAGE=${IMAGE_ARG}
Step #1:  ---> Running in b3733184b215
Step #1: Removing intermediate container b3733184b215
Step #1:  ---> 488fce3d02e7
Step #1: Step 4/4 : RUN apk add --no-cache git openssh
Step #1:  ---> Running in a29162f7efd7
Step #1: fetch http://dl-cdn.alpinelinux.org/alpine/v3.12/main/x86_64/APKINDEX.tar.gz
Step #1: fetch http://dl-cdn.alpinelinux.org/alpine/v3.12/community/x86_64/APKINDEX.tar.gz
Step #1: (1/14) Installing nghttp2-libs (1.41.0-r0)
Step #1: (2/14) Installing libcurl (7.77.0-r0)
Step #1: (3/14) Installing expat (2.2.9-r1)
Step #1: (4/14) Installing pcre2 (10.35-r0)
Step #1: (5/14) Installing git (2.26.3-r0)
Step #1: (6/14) Installing openssh-keygen (8.3_p1-r2)
Step #1: (7/14) Installing ncurses-terminfo-base (6.2_p20200523-r0)
Step #1: (8/14) Installing ncurses-libs (6.2_p20200523-r0)
Step #1: (9/14) Installing libedit (20191231.3.1-r0)
Step #1: (10/14) Installing openssh-client (8.3_p1-r2)
Step #1: (11/14) Installing openssh-sftp-server (8.3_p1-r2)
Step #1: (12/14) Installing openssh-server-common (8.3_p1-r2)
Step #1: (13/14) Installing openssh-server (8.3_p1-r2)
Step #1: (14/14) Installing openssh (8.3_p1-r2)
Step #1: Executing busybox-1.31.1-r16.trigger
Step #1: OK: 28 MiB in 29 packages
Step #1: Removing intermediate container a29162f7efd7
Step #1:  ---> 934f2cab9251
Step #1: [Warning] One or more build-args [ARCH] were not consumed
Step #1: Successfully built 934f2cab9251
Step #1: Successfully tagged gcr.io/k8s-staging-test-infra/git:v20210610-b2adebc132-arm64
Finished Step #1
Starting Step #2
Step #2: Already have image (with digest): gcr.io/cloud-builders/docker
Step #2: no such manifest: gcr.io/k8s-staging-test-infra/git:v20210610-b2adebc132
Finished Step #2
ERROR
ERROR: build step 2 "gcr.io/cloud-builders/docker" failed: step exited with non-zero status: 1

LorbusChris · 2021-06-10T16:32:45Z

@spiffxp thank you for taking a look 🙏
I've pushed an update, could you try again?

Uses a custom arm64 rebuild of the git image TODO(lorbus): Use image build from kubernetes#22450 Requires: kubernetes#22450

LorbusChris · 2021-06-11T16:19:32Z

I'm not sure cloudbuild can actually do what I'd like it to do here. In any case this would require #22444 to go in first as that's the base image for this one.

fejta · 2021-06-12T06:22:57Z

Is docker buildx useful here?

LorbusChris · 2021-06-14T14:20:41Z

@fejta I think it would be. Is there a builder base that has it? (It doesn't seem to be included in gcr.io/cloud-builders/docker)

LorbusChris · 2021-06-18T19:26:22Z

#22444 has merged, this should be ready to go now
/hold cancel

fejta · 2021-06-18T19:33:05Z

images/git/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM gcr.io/k8s-prow/alpine:v20200605-44f6c96
+FROM gcr.io/k8s-prow/alpine:latest


Please use a tagged version. We automatically send PRs to upgrade to the latest tagged version when this changes. (this is specific behavior for gcr.io/k8s-prow images)

That probably means I have to wait until alpine is rebuilt with the changes from #22444, and the auto-PR changing the tag has merged?

Hm looks like #22444 broke alpine postsubmit job :/

That issue seemed to be a transient one. Thanks for re-renunning it @fejta!
Thus, this PR here should be good to go now :)

k8s-ci-robot · 2021-06-18T21:16:11Z

[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:

~~OWNERS~~ [fejta]

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

LorbusChris · 2021-06-18T21:17:23Z

/hold
I forgot to update the FROM directive 😬, one sec

This commit switches the builder base image used for building the git image to `gcr.io/k8s-testimages/gcb-docker-gcloud` in order to do multi-arch (amd64 and arm64) builds via `docker buildx build`, yielding a multi-arch manifest.

LorbusChris · 2021-06-18T21:26:41Z

phew close call 😄

/hold cancel

fejta · 2021-06-18T21:44:43Z

/lgtm

…

k8s-ci-robot requested a review from stevekuznetsov June 7, 2021 16:14

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 7, 2021

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/images sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jun 7, 2021

alvaroaleman reviewed Jun 7, 2021

View reviewed changes

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 Jun 7, 2021

k8s-ci-robot requested a review from BenTheElder June 8, 2021 14:32

k8s-ci-robot requested review from fejta and removed request for BenTheElder June 9, 2021 12:07

LorbusChris added a commit to LorbusChris/test-infra that referenced this pull request Jun 10, 2021

WIP: Pull git-base-arm64 image

31b1652

Requires: kubernetes#22450

LorbusChris added a commit to LorbusChris/test-infra that referenced this pull request Jun 10, 2021

WIP: Pull git-base-arm64 image

ebce45d

Requires: kubernetes#22450

LorbusChris mentioned this pull request Jun 10, 2021

prow: build images for arm64 #22362

Merged

LorbusChris added a commit to LorbusChris/test-infra that referenced this pull request Jun 10, 2021

WIP: Pull git-base-arm64 image

1b4b995

Requires: kubernetes#22450

k8s-ci-robot requested a review from spiffxp June 10, 2021 15:57

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

spiffxp mentioned this pull request Jun 10, 2021

images/alpine: Build for arm64 #22444

Merged

LorbusChris force-pushed the git-arm64 branch from b2adebc to b62d4da Compare June 10, 2021 16:30

LorbusChris added a commit to LorbusChris/test-infra that referenced this pull request Jun 10, 2021

WIP: Pull git-base-arm64 image

1620725

Uses a custom arm64 rebuild of the git image TODO(lorbus): Use image build from kubernetes#22450 Requires: kubernetes#22450

LorbusChris added a commit to LorbusChris/test-infra that referenced this pull request Jun 10, 2021

WIP: Pull git-base-arm64 image

b054bd5

Uses a custom arm64 rebuild of the git image TODO(lorbus): Use image build from kubernetes#22450 Requires: kubernetes#22450

LorbusChris changed the title ~~images/git: Build for arm64~~ WIP: images/git: Build for arm64 Jun 16, 2021

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2021

LorbusChris force-pushed the git-arm64 branch from b62d4da to 87a07a4 Compare June 18, 2021 19:25

LorbusChris changed the title ~~WIP: images/git: Build for arm64~~ images/git: Build for arm64 Jun 18, 2021

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 18, 2021

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2021

LorbusChris force-pushed the git-arm64 branch from 87a07a4 to e0f3e22 Compare June 18, 2021 19:28

fejta reviewed Jun 18, 2021

View reviewed changes

LorbusChris force-pushed the git-arm64 branch from e0f3e22 to aba471d Compare June 18, 2021 19:43

LorbusChris mentioned this pull request Jun 18, 2021

WIP: config/jobs: Use gcb-docker-gcloud image for building alpine and git images #22609

Closed

fejta approved these changes Jun 18, 2021

View reviewed changes

k8s-ci-robot assigned fejta Jun 18, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 18, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2021

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 18, 2021

LorbusChris added 2 commits June 18, 2021 23:24

images/git: Update alpine base

6acffda

images/git: Build for arm64

22146d8

This commit switches the builder base image used for building the git image to `gcr.io/k8s-testimages/gcb-docker-gcloud` in order to do multi-arch (amd64 and arm64) builds via `docker buildx build`, yielding a multi-arch manifest.

LorbusChris force-pushed the git-arm64 branch from aba471d to 22146d8 Compare June 18, 2021 21:25

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 18, 2021

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 18, 2021

k8s-ci-robot merged commit 1017135 into kubernetes:master Jun 18, 2021

k8s-ci-robot added this to the v1.22 milestone Jun 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

images/git: Build for arm64 #22450

images/git: Build for arm64 #22450

LorbusChris commented Jun 7, 2021 •

edited

Loading

k8s-ci-robot commented Jun 7, 2021

alvaroaleman left a comment

LorbusChris commented Jun 7, 2021

LorbusChris commented Jun 8, 2021

LorbusChris commented Jun 9, 2021

spiffxp commented Jun 10, 2021

spiffxp commented Jun 10, 2021

LorbusChris commented Jun 10, 2021

LorbusChris commented Jun 11, 2021 •

edited

Loading

fejta commented Jun 12, 2021

LorbusChris commented Jun 14, 2021

LorbusChris commented Jun 18, 2021

fejta Jun 18, 2021 •

edited

Loading

LorbusChris Jun 18, 2021

LorbusChris Jun 18, 2021

LorbusChris Jun 18, 2021

LorbusChris Jun 18, 2021

k8s-ci-robot commented Jun 18, 2021

LorbusChris commented Jun 18, 2021

LorbusChris commented Jun 18, 2021

fejta commented Jun 18, 2021 via email

images/git: Build for arm64 #22450

images/git: Build for arm64 #22450

Conversation

LorbusChris commented Jun 7, 2021 • edited Loading

k8s-ci-robot commented Jun 7, 2021

alvaroaleman left a comment

Choose a reason for hiding this comment

LorbusChris commented Jun 7, 2021

LorbusChris commented Jun 8, 2021

LorbusChris commented Jun 9, 2021

spiffxp commented Jun 10, 2021

spiffxp commented Jun 10, 2021

LorbusChris commented Jun 10, 2021

LorbusChris commented Jun 11, 2021 • edited Loading

fejta commented Jun 12, 2021

LorbusChris commented Jun 14, 2021

LorbusChris commented Jun 18, 2021

fejta Jun 18, 2021 • edited Loading

Choose a reason for hiding this comment

LorbusChris Jun 18, 2021

Choose a reason for hiding this comment

LorbusChris Jun 18, 2021

Choose a reason for hiding this comment

LorbusChris Jun 18, 2021

Choose a reason for hiding this comment

LorbusChris Jun 18, 2021

Choose a reason for hiding this comment

k8s-ci-robot commented Jun 18, 2021

LorbusChris commented Jun 18, 2021

LorbusChris commented Jun 18, 2021

fejta commented Jun 18, 2021 via email

LorbusChris commented Jun 7, 2021 •

edited

Loading

LorbusChris commented Jun 11, 2021 •

edited

Loading

fejta Jun 18, 2021 •

edited

Loading