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.14 Backports 2024-05-11 #32483

Merged
merged 4 commits into from May 15, 2024
Merged

v1.14 Backports 2024-05-11 #32483

merged 4 commits into from May 15, 2024

Conversation

sayboras
Copy link
Member

Once this PR is merged, a GitHub action will update the labels of these PRs:

 32367

@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels May 11, 2024
@sayboras sayboras force-pushed the pr/v1.14-backport-2024-05-11-11-54 branch from d782860 to 7878a97 Compare May 11, 2024 14:19
[ upstream commit 32b2784 ]

This commit is to re-enable proxy rule installation in native mode if
cilium envoy config or ipsec is enabled. The reason is to handle the
reply packet of hair-pinning traffic in Ingress L7 proxy (i.e. backend
is in the same node).

Relates: 0ebe516
Relates: #29530, #29864

Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 4ce4bb1 ]

This is to make sure that we have a coverage for hair pinning traffic
i.e. backend is on the same node with client. Additionally, this test
will provide some coverage with cloud provider (e.g. GKE), as all other
Ingress/Gateway API/L7 LB tests are running with kind clusters.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit de9c87b ]

After #22006, BPF host routing is enabled by default, this commit is to
enable legacy host routing as a workaround, as the response packet might
be dropped. Further investigation is tracked under #31653.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit bc41564 ]

This is to pick up the changes for Ingress controller connectivity tests

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the pr/v1.14-backport-2024-05-11-11-54 branch from 7878a97 to 13ebecb Compare May 11, 2024 14:26
@sayboras
Copy link
Member Author

/test-backport-1.14

@sayboras sayboras requested review from a team and ldelossa and removed request for a team May 12, 2024 03:43
@sayboras sayboras marked this pull request as ready for review May 12, 2024 23:27
@sayboras sayboras requested review from a team as code owners May 12, 2024 23:27
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.

init.sh changes look fine to me 👍

Copy link
Member

@jschwinger233 jschwinger233 left a comment

Choose a reason for hiding this comment

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

bpf/init.sh looks good.

Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

:rubber-stamp:

@sayboras sayboras merged commit 635423b into v1.14 May 15, 2024
235 checks passed
@sayboras sayboras deleted the pr/v1.14-backport-2024-05-11-11-54 branch May 15, 2024 04:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants