v1.13 Backports 2023-06-28 #26528
Merged
v1.13 Backports 2023-06-28 #26528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit b8786b3 ] This commit is to add loadBalancerIP and loadBalancerClass for shared Ingress service. Kindly note the below points: - loadbalancerIP feature is depending on cloud provider controller - loadBalancerClass is only supported for k8s 1.24 and later. Signed-off-by: Oliver Ni <oliver.ni@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit ee5f473 ] While refactoring the CT lookup helpers, I fat-fingered the order of parameters in the ct_lookup6() helper (which is used by eg. bpf_lxc). But as both parameters are primarily used for tracing policy, this didn't completely break things - we just don't get the expected trace output for packets, and have problems detecting closed / reopened connections. Fix the parameters up to make things work again. [ backporter's note: encountered merge conflict, modified to only switch l4_off and action in the __ct_lookup6 call. ] Fixes: eee902f ("bpf: conntrack: introduce an optimized CT lookup for LB") Reported-by: Marco Iorio <marco.iorio@isovalent.com> Signed-off-by: Julian Wiedmann <jwi@isovalent.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit fd3814e ] before the fix 2 content headers are not returned ```release-note Fix: Return "Content-Type" and "X-Content-Type-Options" headers from Health Check Node Port ``` Signed-off-by: Cezary Zawadka <czawadka@google.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
tklauser
added
kind/backports
|
/test-backport-1.13 Job 'Cilium-PR-K8s-1.25-kernel-4.19' failed: Click to show.Test NameFailure OutputJenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.25-kernel-4.19/766/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. |
julianwiedmann
approved these changes
Jun 28, 2023
squeed
approved these changes
Jun 28, 2023
|
/test-1.25-4.19 |
ldelossa
approved these changes
Jun 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PRs skipped due to conflicts:
Once this PR is merged, you can update the PR labels via:
or with