Do not create etcd name file if etcd is not in use#13727
Merged
brandond merged 1 commit intok3s-io:mainfrom Mar 6, 2026
Merged
Do not create etcd name file if etcd is not in use#13727brandond merged 1 commit intok3s-io:mainfrom
brandond merged 1 commit intok3s-io:mainfrom
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #13727 +/- ##
==========================================
+ Coverage 21.84% 22.22% +0.37%
==========================================
Files 191 191
Lines 15539 15539
==========================================
+ Hits 3394 3453 +59
+ Misses 11692 11611 -81
- Partials 453 475 +22
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
etcd.setName was being called during managed driver creation, even if the managed driver (etcd) is not in use. Let etcd.Register handle calling setName. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
manuelbuil
approved these changes
Mar 5, 2026
vitorsavian
approved these changes
Mar 5, 2026
Member
Author
|
trivy breakage is unrelated. merging. |
This was referenced Mar 11, 2026
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to rancher/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to rancher/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to rancher/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to rancher/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to rancher/rke2
that referenced
this pull request
Mar 13, 2026
Also return error context when podtemplate.Pod fails to hash files. Related to k3s-io/k3s#13727 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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
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
Do not create etcd name file if etcd is not in use
etcd.setName was being called during managed driver creation, even if the managed driver (etcd) is not in use. Let etcd.Register handle calling setName.
The two call paths are:
and then again later, if etcd is actually enabled:
Types of Changes
bugfix
Verification
See linked
Testing
Linked Issues
User-Facing Change
Further Comments