Drop support for running etcd in pod network #38040
Merged
Conversation
This file contains hidden or 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
|
/test |
giorio94
commented
Mar 7, 2025
marseel
approved these changes
Mar 7, 2025
dlapcevic
approved these changes
Mar 7, 2025
14faa30 to
4e6a20e
Compare
rastislavs
approved these changes
Mar 11, 2025
|
/test |
tommyp1ckles
approved these changes
Mar 12, 2025
4e6a20e to
ee79848
Compare
|
Rebased onto main to fix a conflict. |
|
/test |
pippolo84
approved these changes
Mar 14, 2025
Support for running etcd in pod network has been officially deprecated in v1.16 [1], and disabled by default in v1.17 [2]. It is now time to drop it completely, to allow simplifying the watchers logic and possible future associated refactoring. [1]: f99f10b ("docs: Deprecate support for podnetwork etcd") [2]: 86c85da ("watchers: disable CRD to kvstore handover logic") Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Following the removal of the support for running etcd in pod network, let's rework the CiliumNode watcher dropping the handover logic, which is complex and fragile. Indeed, the watcher is now guaranteed to not be started at all when Cilium is configured in kvstore mode. For the same reason, it is no longer necessary to mark the CN resource as stoppable. While being there, let's align the structure to that of the other watchers. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Following the removal of the support for running etcd in pod network, let's rework the CiliumEndpoint and CiliumEndpointSlice watchers dropping the handover logic, which is complex and fragile. Indeed, the watchers are now guaranteed to not be started at all when Cilium is configured in kvstore mode. For the same reason, it is no longer necessary to mark the CEP/CES resources as stoppable. While being there, let's align the structure to that of the other watchers. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Following the removal of the support for running etcd in pod network, let's rework the Pod watchers dropping the handover logic (that is switching from watching all pods to local pods only), in favor of always watching the local pods only. While being there, let's also align the structure to that of the other watchers. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
They are no longer used following the removal of the CRD to kvstore handover logic. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Currently, the `cleanupStatus` method eventually releases the BGP peer config store. However, that resource is not initialized as stoppable, hence this operation is a no-op. Nevertheless, the informer could not be stopped, as events are still observed. In preparation for the subsequent removal of the support for releasable resources, let's drop this call. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
This reverts commit 4226701. Now that all users of releasable resources have been removed, let's drop the extra logic to stop the underlying informer as well, to keep things as simple as possible. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
This reverts commit 49ae544. Now that all users of `promise.MapError` have been removed, let's drop it as well. Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
ee79848 to
e3a5a0e
Compare
Thanks, added an extra commit reverting it. I had to rebase and retrigger CI anyways due to merge conflicts to be fixed. |
|
/test |
pippolo84
approved these changes
Mar 14, 2025
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.
Support for running etcd in pod network has been officially deprecated in v1.16 [1], and disabled by default in v1.17 [2]. It is now time to drop it completely, to allow simplifying the watchers logic and possible future associated refactoring.
[1]: f99f10b ("docs: Deprecate support for podnetwork etcd")
[2]: 86c85da ("watchers: disable CRD to kvstore handover logic")
Please review commit by commit, and refer to the individual commit messages for additional details.
I'm not adding this removal to the upgrade notes, as already announced as part of the previous release, when this support has been disabled behind a hidden flag.