v1.13: node: Fix node encryption condition in incorrect backport #26953
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
Julian noticed that backported commit 7dbd40f ("ipsec: Remove workarounds for path asymmetry that was removed") didn't match the upstream commit due to a wrong conflict resolution. This commit fixes it. We don't expect much impact here as node encryption was never stable, barely used, and eventually removed, but best to fix it, if only for consistency with v1.11 and v1.12. Fixes: 7dbd40f ("ipsec: Remove workarounds for path asymmetry that was removed") Reported-by: Julian Wiedmann <jwi@isovalent.com> Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
pchaigno
added
the
area/encryption
maintainer-s-little-helper
bot
added
backport/1.13
|
/test-backport-1.13 Job 'Cilium-PR-K8s-1.21-kernel-4.19' failed: Click to show.Test NameFailure OutputJenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.21-kernel-4.19/89/ 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. |
|
k8s-1.21-kernel-4.19 hit the docker.io rate limiting. Restarting: |
pchaigno
added
the
ready-to-merge
maintainer-s-little-helper
bot
removed
the
ready-to-merge
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.
Julian noticed that backported commit 7dbd40f ("ipsec: Remove workarounds for path asymmetry that was removed") didn't match the upstream commit due to a wrong conflict resolution. This commit fixes it.
We don't expect much impact here as node encryption was never stable, barely used, and eventually removed, but best to fix it, if only for consistency with v1.11 and v1.12.
Fixes: #26792.