Fix etcd and ca-cert rotate issues #6952
Merged
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
brandond
commented
Feb 13, 2023
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| // setETCDLabelsAndAnnotations will set the etcd role label if not exists also it |
There was a problem hiding this comment.
The code here only ran on apiserver+etcd nodes, while etcd-only nodes had a separate controller that managed their annotation:
k3s/pkg/etcd/metadata_controller.go
Line 50 in 7739c8b
The etcd role annotation is now handled consistently, by running the etcd metadata controller on all server nodes when managed etcd is in use.
briandowns
approved these changes
Feb 13, 2023
dereknola
approved these changes
Feb 13, 2023
brandond
force-pushed
the
fix_etcd_deletion
branch
from
8a45610 to
9d1d5e1
Compare
Turns out etcd-only nodes were never running **any** of the controllers, so allowing multiple controllers didn't really fix things. Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
brandond
force-pushed
the
fix_etcd_deletion
branch
from
9d1d5e1 to
0245787
Compare
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.
Proposed Changes
Fix issues found by QA during pre-release testing
Types of Changes
bugfix
Verification
See linked issues
Testing
Linked Issues
etcd.k3s.cattle.io/removeannotation cannot be used with etcd-only nodes #6816[release-1.25]
etcd.k3s.cattle.io/removeannotation cannot be used with etcd-only nodes #6817 (comment)User-Facing Change
Further Comments