Skip to content

v1.10 backports 2022-05-31 #20028

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
Merged
merged 2 commits into from
Jun 9, 2022
Merged

v1.10 backports 2022-05-31 #20028

merged 2 commits into from
Jun 9, 2022

Conversation

christarazi
Copy link
Member

@christarazi christarazi commented May 31, 2022 •
edited
Loading

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

$ for pr in 18653; do contrib/backporting/set-labels.py $pr done 1.10; done

@christarazi christarazi requested a review from a team as a code owner May 31, 2022 17:40
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels May 31, 2022
@christarazi christarazi force-pushed the pr/v1.10-backport-2022-05-31 branch from d3d62f8 to 0e721da Compare May 31, 2022 17:47
codablock added 2 commits May 31, 2022 15:21
@codablock @christarazi
Move auto detection logic for IPv4NativeRoutingCIDR into own function
264216a 
[ upstream commit 6c6ab74 ]

Signed-off-by: Alexander Block <ablock84@gmail.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@codablock @christarazi
Also take secondary CIDRs into account when checking IPv4NativeRoutin…
ed8a9f5 
…gCIDR

[ upstream commit e8b1210 ]

The given IPv4NativeRoutingCIDR is not necessarely part of the primary
VPC CIDR and may as well be part of one of the secondary CIDRs. We should
take these into account as well before bailing out.

Signed-off-by: Alexander Block <ablock84@gmail.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi force-pushed the pr/v1.10-backport-2022-05-31 branch from 0e721da to ed8a9f5 Compare May 31, 2022 22:23
@christarazi
Copy link
Member Author

christarazi commented Jun 1, 2022 •
edited by maintainer-s-little-helper bot
Loading

/test-backport-1.10

Job 'Cilium-PR-K8s-1.19-kernel-4.9' failed:

Click to show.

Test Name

K8sServicesTest Checks service across nodes Tests NodePort (kube-proxy) with the host firewall and externalTrafficPolicy=Local

Failure Output

FAIL: Request from k8s1 to service tftp://[fd04::12]:32080/hello failed

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

@joamaki
Copy link
Contributor

joamaki commented Jun 7, 2022

/test-backport-1.10

1 similar comment
@joamaki
Copy link
Contributor

joamaki commented Jun 7, 2022

/test-backport-1.10

@joamaki
Copy link
Contributor

joamaki commented Jun 7, 2022 •
edited by christarazi
Loading

/test-backport-1.10

Edit: runtime hit #19598

@joestringer
Copy link
Member

The only failure is in a completely different area with a stacktrace pointing to code that isn't changed in this PR. All other required tests are passing, merging.

@joestringer joestringer merged commit 4c7a729 into cilium:v1.10 Jun 9, 2022
@christarazi christarazi deleted the pr/v1.10-backport-2022-05-31 branch June 9, 2022 18:29
@joestringer joestringer mentioned this pull request Jun 10, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@christarazi @joamaki @joestringer @codablock