[release-1.25] config: do not remove runc if different default runtime #6264
Conversation
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
This commit reverts d2ded1d and adds a test that maintains what it was trying to do. When upgrading from a cluster that uses runc to one that uses crun, there may be workloads that specifically request the old default. Those workloads will fail on restart. To fix this, don't remove runc from the map. We've since added code that means we don't fail if one of the non-default runtimes fails validation (if the binary doesn't exist) so we can handle that situation, which d2ded1d meant to fix. Signed-off-by: Peter Hunt <[email protected]>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## release-1.25 #6264 +/- ##
================================================
- Coverage 43.67% 43.67% -0.01%
================================================
Files 122 122
Lines 13625 13621 -4
================================================
- Hits 5951 5949 -2
+ Misses 7030 7029 -1
+ Partials 644 643 -1 |
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This is an automated cherry-pick of #6257
/assign haircommander