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: copy the cilium-envoy binary into Cilium image #29340

Merged
merged 1 commit into from
Nov 23, 2023

Conversation

aanm
Copy link
Member

@aanm aanm commented Nov 22, 2023

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")

Replace Cilium's base image from ubuntu:22.04 with Cilium's Runtime image (also ubuntu:22.04 based).

@aanm aanm added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Nov 22, 2023
@aanm aanm requested a review from a team as a code owner November 22, 2023 23:08
@aanm aanm requested a review from glibsm November 22, 2023 23:08
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.5 Nov 22, 2023
@aanm
Copy link
Member Author

aanm commented Nov 22, 2023

/test

@aanm
Copy link
Member Author

aanm commented Nov 22, 2023

/test

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.

Discussed offline with Andre, the changes look good to me ✅

@aanm
Copy link
Member Author

aanm commented Nov 22, 2023

/test

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
Copy link
Member Author

aanm commented Nov 22, 2023

/test

@aanm aanm added the backport/author The backport will be carried out by the author of the PR. label Nov 22, 2023
@aanm aanm enabled auto-merge November 23, 2023 10:52
@aanm aanm disabled auto-merge November 23, 2023 10:52
@aanm aanm enabled auto-merge November 23, 2023 10:52
@aanm aanm disabled auto-merge November 23, 2023 23:15
@aanm aanm merged commit 807e494 into cilium:main Nov 23, 2023
61 checks passed
@aanm aanm deleted the pr/fix-image branch November 23, 2023 23:15
@aanm aanm added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Nov 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.5 Nov 24, 2023
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Nov 27, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.14 in 1.14.5 Nov 27, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.14 in 1.14.5 Nov 27, 2023
@aanm aanm added needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Dec 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.10 Dec 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.17 Dec 7, 2023
@aanm aanm added backport-pending/1.12 backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Dec 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.10 Dec 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.17 Dec 7, 2023
@github-actions github-actions bot added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Dec 8, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.10 Dec 8, 2023
@github-actions github-actions bot added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Dec 8, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.12 in 1.12.17 Dec 8, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.12 in 1.12.17 Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/author The backport will be carried out by the author of the PR. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.12.17
Backport done to v1.12
1.13.10
Backport done to v1.13
1.14.5
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

None yet

2 participants