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

Building arm64 admission-webhook image too #109

Merged
merged 1 commit into from
Jun 12, 2023

Conversation

marosset
Copy link
Contributor

Fixes #107

Updating the build process to build a multi-arch container image with both amd64 and arm64 flavors for the admission-webhook

/hold for CI
/sig windows
/assign @jsturtevant

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. sig/windows Categorizes an issue or PR as relevant to SIG Windows. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 25, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marosset

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 25, 2023
@marosset
Copy link
Contributor Author


.PHONY: image_build_int
image_build_int:
$(BUILDX_BUILD) --load $(AMD64_ARGS) -f dockerfiles/Dockerfile -t $(WEBHOOK_IMG):$(TAG) -t $(WEBHOOK_IMG):latest
Copy link
Contributor

Choose a reason for hiding this comment

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

do you need to have a line that does this for ARM64_ARGS

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the image_build targers only build and amd64 image are are intended to be used during integration tests.
the image_build_and_push targets build both amd64 and arm64 images and we do use ARM64_ARGS in there.

I added some comment to clarify this.
Let me know if this makes sense

@@ -59,4 +59,4 @@ clean: cluster_clean clean_integration_tests deps_clean

.PHONY: release-staging
release-staging: ## Builds and push webhook image to k8s-staging bucket
REGISTRY=$(STAGING_REGISTRY) $(MAKE) image_build image_push
REGISTRY=$(STAGING_REGISTRY) $(MAKE) image_push
Copy link
Contributor

Choose a reason for hiding this comment

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

this drops the build step before the push?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had to update the build workflow to use buildkit with --push when we are building the multi-arch image and because of this we only have 1 step now.
I'll rename to image_build_and_push for clarity

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

Signed-off-by: Mark Rossetti <marosset@microsoft.com>
@jsturtevant
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 12, 2023
@marosset
Copy link
Contributor Author

/hold cancel
Let's get this merged so CI will build a staging image for more testing

@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 Jun 12, 2023
@k8s-ci-robot k8s-ci-robot merged commit 1528f51 into kubernetes-sigs:master Jun 12, 2023
@marosset marosset mentioned this pull request Aug 22, 2023
24 tasks
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. 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. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

'multi-arch' windows-gmsa-webhook container image to support arm64.
3 participants