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

Correctly replace ip/tc binaries in complexity-test image #50

Merged
merged 4 commits into from
Mar 22, 2023

Conversation

tklauser
Copy link
Member

In some cases the ip and tc binaries might be symlinks which in the
current installation would lead to only the symlink being deleted, but
not the binary it points at. This could lead to the "old" non-Cilium
binaries still being present in the image. Fix this by making sure to
also clean up the pointed at binary.

This should allow to remove workaround such as the following:

https://github.com/cilium/cilium/pull/24117/files#diff-8a97415e3b1ab63d0cbf682a195a63c178786ae792455f62f7dc523acf9f9b50R211-R212

See commits for details.

Avoid potentially installing packages we don't need.
Also remove apt source lists on clean up.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
…mlinks

In some cases the ip and tc binaries might be symlinks which in the
current installation would lead to only the symlink being deleted, but
not the binary it points at. This could lead to the "old" non-Cilium
binaries still being present in the image. Fix this by making sure to
also clean up the pointed at binary.

This should allow to remove workaround such as the following:

https://github.com/cilium/cilium/pull/24117/files#diff-8a97415e3b1ab63d0cbf682a195a63c178786ae792455f62f7dc523acf9f9b50R211-R212

Signed-off-by: Tobias Klauser <tobias@cilium.io>
info:
{
  "orig_ref": "9aaaabaaf7abd2696df171141846a370703d7562",
  "tag": "20230322.103351"
}

X-GHA-TAG: 20230322.103351
@github-actions github-actions bot force-pushed the pr/tklauser/complexity-test-fix-iproute-binaries-install branch from 30f36b8 to 2b36f58 Compare March 22, 2023 12:27
Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

🚀

@brb brb merged commit d80848b into main Mar 22, 2023
@brb brb deleted the pr/tklauser/complexity-test-fix-iproute-binaries-install branch March 22, 2023 12:48
tklauser added a commit to cilium/cilium that referenced this pull request Mar 22, 2023
… tests

Follow-up for #24117 now that the complexity-test image correctly
replaces the ip binary with the one from the Cilium image, see
cilium/little-vm-helper-images#50

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants