feature: make runtime choosing supported in CRI managers for Kubernetes #1593
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
starnop
force-pushed
the
cri-annotation
branch
4 times, most recently
from
c84d56a
to
a0f3373
Compare
Codecov Report
@@ Coverage Diff @@
## master #1593 +/- ##
==========================================
- Coverage 41.97% 40.82% -1.16%
==========================================
Files 270 270
Lines 17609 18106 +497
==========================================
Hits 7392 7392
- Misses 9307 9806 +499
+ Partials 910 908 -2
|
YaoZengzeng
reviewed
Jun 25, 2018
daemon/mgr/container.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| id := "" | ||
| if id = config.ContainerID; id == "" { |
There was a problem hiding this comment.
Why not code like this:
id := config.ContainerID
if id == "" {
...
}It seems more concise. 😄
shaloulcy
reviewed
Jun 28, 2018
cri/v1alpha2/cri_utils.go
Outdated
| @@ -235,18 +236,29 @@ func applySandboxLinuxOptions(hc *apitypes.HostConfig, lc *runtime.LinuxPodSandb | |||
| } | |||
|
|
|||
| // makeSandboxPouchConfig returns apitypes.ContainerCreateConfig based on runtime.PodSandboxConfig. | |||
| func makeSandboxPouchConfig(config *runtime.PodSandboxConfig, image string) (*apitypes.ContainerCreateConfig, error) { | |||
| func makeSandboxPouchConfig(config *runtime.PodSandboxConfig, sandboxID string, image string) (*apitypes.ContainerCreateConfig, error) { | |||
shaloulcy
reviewed
Jun 28, 2018
daemon/annotations/annotations.go
Outdated
| @@ -0,0 +1,19 @@ | |||
| package annotations | |||
There was a problem hiding this comment.
maybe we should put the annotations into cri package
shaloulcy
reviewed
Jun 28, 2018
cri/v1alpha1/cri.go
Outdated
| @@ -161,19 +162,23 @@ func (c *CriManager) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox | |||
| return nil, err | |||
| } | |||
|
|
|||
| id, err := c.ContainerMgr.GenerateID() | |||
There was a problem hiding this comment.
what's the purpose of generating ContainerID in CRI?
There was a problem hiding this comment.
It will be used before sandbox has been created.
starnop
force-pushed
the
cri-annotation
branch
2 times, most recently
from
cb2eebf
to
6f67f23
Compare
starnop
force-pushed
the
cri-annotation
branch
3 times, most recently
from
dca0326
to
364bf2b
Compare
fuweid
reviewed
Jul 5, 2018
apis/types/container_config.go
Outdated
| @@ -35,6 +35,9 @@ type ContainerConfig struct { | |||
| // Command to run specified an array of strings. | |||
| Cmd []string `json:"Cmd"` | |||
|
|
|||
| // The ID of the container | |||
| ContainerID string `json:"ContainerID,omitempty"` | |||
There was a problem hiding this comment.
ContainerID is used to be as SandboxID? I think it's a little confusing in the API level. Could we use annotation to handle this part?
cc @YaoZengzeng @starnop
fuweid
reviewed
Jul 5, 2018
cri/v1alpha2/cri_utils.go
Outdated
| @@ -610,6 +616,19 @@ func applyContainerSecurityContext(lc *runtime.LinuxContainerConfig, podSandboxI | |||
|
|
|||
| // Apply Linux-specific options if applicable. | |||
| func (c *CriManager) updateCreateConfig(createConfig *apitypes.ContainerCreateConfig, config *runtime.ContainerConfig, sandboxConfig *runtime.PodSandboxConfig, podSandboxID string) error { | |||
| // Apply runtime options. | |||
| if annotations := config.GetAnnotations(); annotations != nil { | |||
| createConfig.HostConfig.Runtime = annotations[anno.KubernetesRuntime] | |||
There was a problem hiding this comment.
if the annotations[anno.KubernetesRuntime] is emtpy?
There was a problem hiding this comment.
createConfig.HostConfig.Runtime will be "", and then PouchContainer will use the DefaultRuntime,which is runc.
// set container runtime
if config.HostConfig.Runtime == "" {
config.HostConfig.Runtime = mgr.Config.DefaultRuntime
}
Signed-off-by: Starnop <starnop@163.com>
|
LGTM @YaoZengzeng please take a look |
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.
Signed-off-by: Starnop starnop@163.com
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
fixes part of #1580
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
pouch psto observe the runtime of the container.Ⅴ. Special notes for reviews