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.

Sign up for GitHub

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

Jump to bottom

[v1.9] docker: bump cilium-iproute2 image #14619

Merged
merged 3 commits into from
Jan 15, 2021
Merged

[v1.9] docker: bump cilium-iproute2 image #14619

merged 3 commits into from
Jan 15, 2021

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Jan 14, 2021 •
edited by aanm
Loading

Backport #14593 to 1.9.

The same iproute2 image tag as in the original PR is used, but cilium-runtime and then cilium-builder have been rebuilt specifically for the 1.9 branch. See notes in individual commit logs for adjustments.

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

for pr in 14593; do contrib/backporting/set-labels.py $pr done 1.9; done

@qmonnet
docker: bump cilium-iproute2 image
f372177 
[ upstream commit 12c708a ]

One recent addition is the ability to better observe xfrm output masks
for IPsec.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet
docker: bump cilium-runtime image
5ee379a 
[ upstream commit ab91478 ]

Following the bump of iproute2 image.

[ Backport note: Moved update for cilium-runtime-dev image from previous
    commit to this one, where it is supposed to be. ]

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet
docker: bump cilium-builder image
f17e5c2 
[ upstream commit b99864a ]

Following the bump of cilium-runtime image.

[ Backport note: Update test/docker-compose.yml, removed in master. ]

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet qmonnet requested a review from pchaigno January 14, 2021 18:16
@qmonnet qmonnet requested a review from a team as a code owner January 14, 2021 18:16
@maintainer-s-little-helper maintainer-s-little-helper bot added the kind/backports This PR provides functionality previously merged into master. label Jan 14, 2021
@qmonnet
Copy link
Member Author

qmonnet commented Jan 14, 2021

test-backport-1.9

@qmonnet
Copy link
Member Author

qmonnet commented Jan 15, 2021

Following Paul's steps:

$ ks exec cilium-b2mx8 -- ip xfrm s
src :: dst fd00::10a
        proto esp spi 0x00000006 reqid 1 mode tunnel
        replay-window 0 
        mark 0xd00/0xf00 output-mark 0xd00/0xf00
        aead rfc4106(gcm(aes)) 0x44434241343332312423222114131211f4f3f2f1 128
        anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000
        sel src ::/0 dst ::/0
[...]

I could confirm that the output mask is visible.

@pchaigno pchaigno removed their assignment Jan 15, 2021
@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 15, 2021
@aanm aanm merged commit e631562 into v1.9 Jan 15, 2021
@aanm aanm deleted the pr/qmonnet/v1.9-backport-14593 branch January 15, 2021 12:01
@aanm aanm mentioned this pull request Jan 20, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchaigno pchaigno pchaigno approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@qmonnet @pchaigno @aanm