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.15-backport] Introduce fromEgressProxyRule #31922

Merged
merged 4 commits into from
Apr 26, 2024

Conversation

jschwinger233
Copy link
Member

@jschwinger233 jschwinger233 commented Apr 12, 2024

@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Apr 12, 2024
@jschwinger233 jschwinger233 changed the title [1.15] Introduce fromEgressProxyRule for ci-ipsec-upgrade [1.15] Introduce fromEgressProxyRule Apr 12, 2024
@jschwinger233 jschwinger233 force-pushed the gray/1.15/proxy-route-fix branch 2 times, most recently from 5901e39 to 37290f9 Compare April 12, 2024 09:16
@jschwinger233
Copy link
Member Author

/test-backport-1.15

@jschwinger233 jschwinger233 changed the title [1.15] Introduce fromEgressProxyRule [v1.15] Introduce fromEgressProxyRule Apr 12, 2024
[ upstream commit: 287dd63 ]

Because we are introducing fromEgressProxyRule soon, it's better to make
clear that the fromProxyRule is for ingress proxy only.

This commit also changes its mark from MagicMarkIsProxy to
MagicMarkIngress. They hold the same value 0xA00 while have the
different semantics.

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
[ upstream commit: 1dd2179 ]

No logic changes, just rename it to "RulePriorityFromProxy" without
"Ingress" suffix, because egress rule is using the same priority.

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
[ upstream commit: 7d278af ]

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
[ upstream commit: 53133ff ]

Although we don't install fromEgressProxyRule for now, this commit
insists on removing it to make sure further downgrade can go smoothly.

Soon We'll have another PR to install fromEgressProxyRule, and cilium
downgrade from that PR to branch tip (patch downgrade, 1.X.Y ->
1.X.{Y-1}) will be broken if we don't handle the new ip rule carefullly.

Without this patch, downgrade from higher version will leave
fromEgressProxyRule on the lower version cilium, cluster will be in a
wrong status of "having stale ip rule + not having other necessary
settings (iptables)", breaking the connectivity.

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
@jschwinger233
Copy link
Member Author

/test-backport-1.15

@jschwinger233 jschwinger233 changed the title [v1.15] Introduce fromEgressProxyRule [v1.15-backport] Introduce fromEgressProxyRule Apr 26, 2024
@jschwinger233 jschwinger233 marked this pull request as ready for review April 26, 2024 05:33
@jschwinger233 jschwinger233 requested a review from a team as a code owner April 26, 2024 05:33
Copy link
Contributor

@ti-mo ti-mo left a comment

Choose a reason for hiding this comment

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

Nit: two signoff trailers in your commit messages:

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>

Also in v1.14 and v1.13.

@ti-mo ti-mo merged commit 694b365 into cilium:v1.15 Apr 26, 2024
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

2 participants