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

v1.15 Backports 2024-12-03 #36313

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Conversation

jschwinger233
Copy link
Member

Once this PR is merged, a GitHub action will update the labels of these PRs:

 35697

[ upstream commit f0d3f93 ]

The hubble image currently uses the golang docker image within the build
stage. This commit modifies the build stage to use the cilium-builder
image instead which contains the necessary tooling to allow for arm64
builds in CI workflows that run on amd64 machines.

See #35351 and
#35324 for more context.

Signed-off-by: Ryan Drew <ryan.drew@isovalent.com>
Signed-off-by: gray <greyschwinger@gmail.com>
@jschwinger233 jschwinger233 added kind/backports This PR provides functionality previously merged into master. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Dec 3, 2024
@jschwinger233
Copy link
Member Author

/test-backport-1.15

@jschwinger233 jschwinger233 marked this pull request as ready for review December 3, 2024 08:26
@jschwinger233 jschwinger233 requested a review from a team as a code owner December 3, 2024 08:26
Copy link
Contributor

@learnitall learnitall left a comment

Choose a reason for hiding this comment

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

Thanks!

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 3, 2024
@joestringer joestringer merged commit 95970b1 into v1.15 Dec 3, 2024
254 checks passed
@joestringer joestringer deleted the pr/v1.15-backport-2024-12-03-03-15 branch December 3, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants