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.12 Backports 2023-12-14 [Author Submitted] #29871

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

jrfastab
Copy link
Contributor

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

29801

…publish"

[ upstream commit 0d1ee39 ]

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 backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Dec 13, 2023
@jrfastab jrfastab marked this pull request as ready for review December 13, 2023 21:04
@jrfastab jrfastab requested a review from a team as a code owner December 13, 2023 21:04
@jrfastab jrfastab changed the title v1.12 Backports 2023-12-14 [Author Submitted] #29868 v1.12 Backports 2023-12-14 [Author Submitted] Dec 13, 2023
@jrfastab
Copy link
Contributor Author

/test-backport-1.12

@jrfastab
Copy link
Contributor Author

/ci-test-1.22-4.9

@jrfastab
Copy link
Contributor Author

/test-1.22-4.9

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 14, 2023
@jrfastab jrfastab merged commit 2ec3341 into v1.12 Dec 14, 2023
114 of 123 checks passed
@jrfastab jrfastab deleted the pr/jrfastab/backport-v112 branch December 14, 2023 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

3 participants