config: do not remove runc if different default runtime #6257
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander 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 |
|
@harche we return again, PTAL, lemme know how you feel about this |
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]>
89fc43c to
4816834
Compare
|
also @cynepco3hahue because you chimed in here |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #6257 +/- ##
==========================================
- Coverage 43.70% 43.70% -0.01%
==========================================
Files 122 122
Lines 13666 13662 -4
==========================================
- Hits 5973 5971 -2
+ Misses 7047 7046 -1
+ Partials 646 645 -1 |
|
The kata CI is failing here because the test was renamed. |
|
/lgtm |
|
@littlejawa should I wait to merge this till that one does, or should I override this because that relies on this? |
@haircommander - the problem if we merge this PR is that all subsequent PRs targetting the main branch will fail because of these tests :-( |
|
/retest-kata |
|
/retest |
|
thank you @littlejawa /cherry-pick release-1.25 |
|
@haircommander: new pull request created: #6264 DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
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]
What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?