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

images/cilium: set IMAGE_CROSS_TARGET_PLATFORM for right arch #15074

Merged
merged 2 commits into from
Feb 24, 2021

Conversation

aanm
Copy link
Member

@aanm aanm commented Feb 23, 2021

This variable is used to cross compile certain targets. Fixes the build
of 'cilium-map-migrate' in multi-arch.

Fixes: 706fc42 ("add multi-arch support into all images")
Signed-off-by: André Martins andre@cilium.io

Fixes: #15073

@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Feb 23, 2021
@aanm aanm requested a review from a team as a code owner February 23, 2021 10:34
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Feb 23, 2021
@jaffcheng
Copy link
Contributor

Looks like we need a cross arch libelf-dev?

@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:34 Inactive
@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:34 Inactive
@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:42 Inactive
@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:42 Inactive
@aanm
Copy link
Member Author

aanm commented Feb 23, 2021

test-me-please

@aanm aanm requested a review from a team as a code owner February 23, 2021 13:51
@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:51 Inactive
@aanm aanm temporarily deployed to release-base-images February 23, 2021 13:51 Inactive
@aanm
Copy link
Member Author

aanm commented Feb 23, 2021

test-me-please

@aanm
Copy link
Member Author

aanm commented Feb 23, 2021

retest-gke

@aanm
Copy link
Member Author

aanm commented Feb 23, 2021

retest-1.20-4.9 (previous https://jenkins.cilium.io/job/Cilium-PR-K8s-1.20-kernel-4.9/753/)

@aanm aanm marked this pull request as draft February 23, 2021 19:04
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:22 Inactive
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:22 Inactive
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:30 Inactive
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:30 Inactive
@aanm
Copy link
Member Author

aanm commented Feb 24, 2021

test-me-please

Signed-off-by: André Martins <andre@cilium.io>
This variable is used to cross compile certain targets. Fixes the build
of 'cilium-map-migrate' in multi-arch.

Fixes: 706fc42 ("add multi-arch support into all images")
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:59 Inactive
@aanm aanm temporarily deployed to release-base-images February 24, 2021 10:59 Inactive
@aanm
Copy link
Member Author

aanm commented Feb 24, 2021

test-me-please

@aanm aanm marked this pull request as ready for review February 24, 2021 14:52
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

For the builder image side, this LGTM. We seem to add the arm64 compiler to the x86 image as well, but since we won't ship this image to user clusters I'm fine with that.

Looking at commit 68c961d however, we also recently removed the compilers image from the runtime side. What I'm expecting at a high level is that we build our own version of LLVM, strip it down so it only contains the bits necessary for BPF compilation, and we ship that compiler in the runtime image.

@aanm aanm merged commit 94fb514 into cilium:master Feb 24, 2021
1.10.0 automation moved this from In progress to Done Feb 24, 2021
@aanm aanm deleted the pr/fix-cilium-map-migrate branch February 24, 2021 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

incorrect arch for cilium-map-migrate in arm64 image
6 participants