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

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

aanm
Copy link
Member

@aanm aanm commented Dec 7, 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.13; done

or with

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

@aanm aanm added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Dec 7, 2023
@aanm aanm requested a review from sayboras December 7, 2023 17:02
@aanm aanm requested a review from a team as a code owner December 7, 2023 17:02
@aanm
Copy link
Member Author

aanm commented Dec 7, 2023

/test-backport-1.13

Job 'Cilium-PR-K8s-1.24-kernel-4.19' failed:

Click to show.

Test Name

K8sAgentPolicyTest Multi-node policy test with L7 policy using connectivity-check to check datapath

Failure Output

FAIL: cannot install connectivity-check

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-4.19/289/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.24-kernel-4.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@aanm aanm added the release-blocker/1.13 This issue will prevent the release of the next version of Cilium. label Dec 7, 2023
@aanm
Copy link
Member Author

aanm commented Dec 7, 2023

/test-1.24-4.19

images/cilium/Dockerfile Outdated Show resolved Hide resolved
[ 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>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras
Copy link
Member

sayboras commented Dec 8, 2023

/test-backport-1.13

@aanm aanm merged commit 768b116 into cilium:v1.13 Dec 8, 2023
61 of 62 checks passed
@aanm aanm deleted the pr/backport-envoy-fix-1.13 branch December 8, 2023 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. release-blocker/1.13 This issue will prevent the release of the next version of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants