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

Restore original order of agent startup functions #9539

Merged
merged 4 commits into from
Feb 21, 2024

Conversation

dereknola
Copy link
Member

@dereknola dereknola commented Feb 21, 2024

Proposed Changes

  • Partial revert of Allow executors to define containerd and cridockerd behavior #9184, restoring the orginal order of setting up container runtimes, closing the channel, then running the kubelet.
  • Renamed AgentReady to ContainerRuntimeReady to better reflect what the channel is actually tracking.
  • Closed E2E coverage gap around this issue by increasing number of etcd nodes in the split role test.

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.

Signed-off-by: Derek Nola <derek.nola@suse.com>
@dereknola dereknola requested a review from a team as a code owner February 21, 2024 18:36
@brandond
Copy link
Member

brandond commented Feb 21, 2024

Would you mind also pulling in brandond@1af2fe4

I think that should work?

pkg/agent/run.go Outdated Show resolved Hide resolved
pkg/cli/server/server.go Outdated Show resolved Hide resolved
pkg/cli/server/server.go Outdated Show resolved Hide resolved
@dereknola dereknola force-pushed the revert_container_runtime_launch branch from 10a9bec to 5cf06ec Compare February 21, 2024 18:47
pkg/etcd/etcd.go Outdated Show resolved Hide resolved
dereknola and others added 3 commits February 21, 2024 10:58
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 dereknola force-pushed the revert_container_runtime_launch branch from 5cf06ec to 466decb Compare February 21, 2024 18:58
Copy link

codecov bot commented Feb 21, 2024

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (1c17461) 49.50% compared to head (466decb) 42.95%.

Files Patch % Lines
pkg/agent/run.go 41.66% 4 Missing and 3 partials ⚠️
pkg/etcd/etcd.go 50.00% 2 Missing ⚠️
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     
Flag Coverage Δ
e2etests ?
inttests 39.52% <52.38%> (+0.01%) ⬆️
unittests 15.96% <16.66%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants