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

Revert "cilium: Ensure xfrm state is initialized for route IP before … #29801

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

jrfastab
Copy link
Contributor

@jrfastab jrfastab commented Dec 11, 2023

This reverts commit c9ea7a5.

This works around a condition where restarting the agent uses a new
IP for Cilium Internal IP. But, it turns out this is because of an
incorrect set helm chart option in our reproducer. When configured
correctly we require CiliumInternalIP to reused so this patch is not
necessary. In fact it complicates the code so lets drop it.

The helm option is cleanState. It must be set to false

cleanState=false

Note that cleanState="false" is a string type and will default to
true because of bool typing. Creating a subtle and broke config.

Signed-off-by: John Fastabend john.fastabend@gmail.com

…publish"

This reverts commit c9ea7a5.

This works around a condition where restarting the agent uses a new
IP for Cilium Internal IP. But, it turns out this is because of an
incorrect set helm chart option in our reproducer. When configured
correctly we require CiliumInternalIP to reused so this patch is not
necessary. In fact it complicates the code so lets drop it.

The helm option is cleanState. It must be set to false

  cleanState=false

Note that cleanState="false" is a string type and will default to
true because of bool typing. Creating a subtle and broke config.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Dec 11, 2023
@jrfastab jrfastab marked this pull request as ready for review December 11, 2023 23:27
@jrfastab jrfastab requested review from a team as code owners December 11, 2023 23:27
@jrfastab jrfastab force-pushed the pr/jrfastab/revert-ipsec-init branch from 841c594 to 30399d7 Compare December 11, 2023 23:35
@pchaigno
Copy link
Member

/test

@pchaigno pchaigno added the release-note/misc This PR makes changes that have no direct user impact. label Dec 12, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Dec 12, 2023
@pchaigno pchaigno added area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Dec 12, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Dec 12, 2023
@pchaigno pchaigno added this pull request to the merge queue Dec 13, 2023
Merged via the queue into main with commit 0d1ee39 Dec 13, 2023
206 of 207 checks passed
@pchaigno pchaigno deleted the pr/jrfastab/revert-ipsec-init branch December 13, 2023 19:24
@jrfastab jrfastab added the backport/author The backport will be carried out by the author of the PR. label Dec 13, 2023
@jrfastab jrfastab added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Dec 13, 2023
@jrfastab jrfastab added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Dec 13, 2023
@jrfastab jrfastab added the backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. label Dec 13, 2023
@github-actions github-actions bot added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.12 backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Dec 14, 2023
@michi-covalent michi-covalent removed the backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. label Dec 15, 2023
@github-actions github-actions bot added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. backport/author The backport will be carried out by the author of the PR. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Status: Released
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

4 participants