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.14] images/cilium: copy the cilium-envoy binary into Cilium image #29364

Merged
merged 1 commit into from
Nov 27, 2023

Conversation

aanm
Copy link
Member

@aanm aanm commented Nov 24, 2023

Once this PR is merged, you can update the PR labels via:

for pr in 29340; do contrib/backporting/set-labels.py $pr done 1.14; done

or with

make add-labels BRANCH=v1.14 ISSUES=29340

[ upstream commit 807e494 ]

When we integrated cilium-envoy into Cilium's image we have made the
assumption that the image only contained the cilium-envoy binary, which
made it safe to copy the entire image into Cilium's. However, since
3698c40, the cilium-envoy's base image was switched to Ubuntu's
instead of "scratch". This had the consequence of overwriting the files
of Cilium's Runtime image with Cilium-envoy's base image. To fix this,
we should only copy the cilium-envoy binary available on the
cilium-envoy image.

Fixes: 3698c40 ("cilium/proxy: updating proxy image to latest version")
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added the backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. label Nov 24, 2023
@aanm aanm requested a review from a team as a code owner November 24, 2023 12:49
@aanm aanm requested a review from glibsm November 24, 2023 12:49
@maintainer-s-little-helper maintainer-s-little-helper bot added the kind/backports This PR provides functionality previously merged into master. label Nov 24, 2023
@aanm
Copy link
Member Author

aanm commented Nov 24, 2023

/test-backport-1.14

@aanm aanm requested review from sayboras and removed request for glibsm November 24, 2023 12:50
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Thanks and LGTM ✔️

@aanm aanm merged commit 72ea100 into cilium:v1.14 Nov 27, 2023
59 of 60 checks passed
@aanm aanm deleted the pr/v1.14-backport-2023-11-24--help branch November 27, 2023 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants