-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Restore original order of agent startup functions #9539
Merged
dereknola
merged 4 commits into
k3s-io:master
from
dereknola:revert_container_runtime_launch
Feb 21, 2024
Merged
Restore original order of agent startup functions #9539
dereknola
merged 4 commits into
k3s-io:master
from
dereknola:revert_container_runtime_launch
Feb 21, 2024
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
Signed-off-by: Derek Nola <derek.nola@suse.com>
Would you mind also pulling in brandond@1af2fe4 I think that should work? |
brandond
reviewed
Feb 21, 2024
brandond
reviewed
Feb 21, 2024
brandond
requested changes
Feb 21, 2024
dereknola
force-pushed
the
revert_container_runtime_launch
branch
from
February 21, 2024 18:47
10a9bec
to
5cf06ec
Compare
brandond
reviewed
Feb 21, 2024
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
dereknola
force-pushed
the
revert_container_runtime_launch
branch
from
February 21, 2024 18:58
5cf06ec
to
466decb
Compare
brandond
approved these changes
Feb 21, 2024
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #9539 +/- ##
==========================================
- Coverage 49.50% 42.95% -6.56%
==========================================
Files 151 154 +3
Lines 13475 13523 +48
==========================================
- Hits 6671 5809 -862
- Misses 5464 6548 +1084
+ Partials 1340 1166 -174
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
HarrisonWAffel
approved these changes
Feb 21, 2024
cwayne18
approved these changes
Feb 21, 2024
This was referenced Feb 21, 2024
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
containerd
andcridockerd
behavior #9184, restoring the orginal order of setting up container runtimes, closing the channel, then running the kubelet.AgentReady
toContainerRuntimeReady
to better reflect what the channel is actually tracking.Types of Changes
Bugfix
Verification
Manually running split servers (3 etcd, 2 cp, 1 agent), the cluster now initialized all etcd nodes correctly.
Testing
Change is now covered by E2E test, and the docker/drone
test
stage now covers this case.Linked Issues
#9540
User-Facing Change
Further Comments
I will not be squashing this, as we want the revert commit to stand alone from the other 2 "new" changes.