runtime: revert part of #6206#6535
Closed
fuweid wants to merge 1 commit intocontainerd:mainfrom
Closed
Conversation
In container bundle, the `runtime` file has been reserved for runtime's `BinaryName` like runc or crun[1]. In containerd#6206, we supported to use absolute path as shim runtime name and also stored it in `runtime` file[2]. It will be conflict if user wants to use BinaryName instead of empty default value. Before we figure out new filename for shim binary path, I would like to revert the code from containerd#6206 because the information has been stored in container store service. If the shim runtime is absolute binary path, we can just read it from container store service. If it is normal shim name like `io.containerd.runc.v2`, we need to resolve it into binary path again, which is the same to before pr containerd#6206. Reference: [1]: containerd@6bcbf88 [2]: containerd#6206 Fixes: containerd#6534 Signed-off-by: Wei Fu <[email protected]>
Member
Should we figure out new name instead of reverting? :) |
Member
Author
In container ecosystem, runtime is confusing word :) at least to me. And we are introducing sandbox api and so yeah. Runtime looks like any words 😂 I am ok to use other filename to fix it. Maybe less-confusing word |
Member
|
would |
Member
|
Changed in #6536 |
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
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.
runtime: revert part of #6206
In container bundle, the
runtimefile has been reserved for runtime'sBinaryNamelike runc or crun 1. In #6206, we supported to useabsolute path as shim runtime name and also stored it in
runtimefile2. It will be conflict if user wants to use BinaryName instead of
empty default value.
Before we figure out new filename for shim binary path, I would like to
revert the code from #6206 because the information has been stored in
container store service. If the shim runtime is absolute binary path,
we can just read it from container store service. If it is normal shim name
like
io.containerd.runc.v2, we need to resolve it into binary path again,which is the same to before pr #6206.
Fixes: #6534
Signed-off-by: Wei Fu [email protected]