cri: call RegisterReadiness after NewCRIService#9164
Merged
dmcgowan merged 1 commit intocontainerd:mainfrom Sep 29, 2023
Merged
cri: call RegisterReadiness after NewCRIService#9164dmcgowan merged 1 commit intocontainerd:mainfrom
dmcgowan merged 1 commit intocontainerd:mainfrom
Conversation
AkihiroSuda
added
area/cri
`NewCRIService()` may easily fail and its error has to be ignored unless the CRI plugin is in the `required_plugins` list. Now this has to be called before `RegisterReadiness()`, as PR 9153 "Require plugins to succeed after registering readiness" was merged on 2023-09-29. Fix issue 9163: `[Regression in main (2023-09-29)]: containerd-rootless.sh doesn't start up` Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
fix-9163
branch
from
5fa0a0a to
5365f4b
Compare
dmcgowan
approved these changes
Sep 29, 2023
This was referenced Sep 29, 2023
dmcgowan
added
cherry-picked/1.6.x
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
NewCRIService()may easily fail and its error has to be ignored unless the CRI plugin is in therequired_pluginslist.Now this has to be called before
RegisterReadiness(), as PR #9153Require plugins to succeed after registering readinesswas merged on 2023-09-29.Fix #9163:
[Regression in main (2023-09-29)]: containerd-rootless.sh doesn't start up