fix(upgrade): remove version check for rancher-system-agent workaround (backport #4966) #5381
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
We need RKE2 server/agent to not restart during Rancher upgrade. This is true no matter what version we're upgrading from/to, so changing the workaround applied to RSA (rancher-system-agent) to be a part of the regular upgrade flow by removing the version checking. Signed-off-by: Zespre Chang <zespre.chang@suse.com> (cherry picked from commit 804669f)
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## v1.2 #5381 +/- ##
==========================================
+ Coverage 24.60% 24.96% +0.36%
==========================================
Files 88 89 +1
Lines 10616 10714 +98
==========================================
+ Hits 2612 2675 +63
- Misses 7719 7748 +29
- Partials 285 291 +6 ☔ View full report in Codecov by Sentry. |
bk201
approved these changes
Mar 18, 2024
ibrokethecloud
approved these changes
Apr 16, 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.
Problem:
Previously, the workaround applied to
rancher-system-agentfor not restarting RKE2 server/agent remains on the nodes if an upgrade failed after upgrading Harvester charts (in phase 3). This is problematic if an upgrade from v1.1.x to v1.2.x failed, and the user want to start over the upgrade again. This will effectively become an upgrade from v1.2.x to v1.2.x, and the workaround will not be removed in the pre-drain phase because of the version checking.Solution:
We need RKE2 server/agent to not restart during Rancher upgrade. This is true no matter what version we're upgrading from/to, so changing the workaround applied to rancher-system-agent to be a part of the regular upgrade flow by removing the version checking.
Related Issue:
#5380
Test plan:
/run/systemd/system/rancher-system-agent.service.d/directory on the nodesFor QA engineers, the test plan would be:
/run/systemd/system/rancher-system-agent.service.d/directory on the nodesThis is an automatic backport of pull request fix(upgrade): remove version check for rancher-system-agent workaround #4966 done by Mergify.