Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: Automated CherryPick Update for release-v4.4 #4191

Merged
merged 1 commit into from Oct 29, 2023
Merged

docs: Automated CherryPick Update for release-v4.4 #4191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 18 additions & 14 deletions staging/src/github.com/labring/image-cri-shim/pkg/cri/cri.go
View file
Open in desktop
Expand Up @@ -164,6 +164,15 @@ func (runtime *ContainerdRuntime) configFile() {

func (runtime *ContainerdRuntime) processConfigFile() (string, error) {
// Config is a wrapper of server config for printing out.
type Runtime struct {
RuntimeType string `toml:"runtime_type"`
RuntimeEngine string `toml:"runtime_engine"`
RuntimeRoot string `toml:"runtime_root"`
Options struct {
SystemdCgroup bool `toml:"SystemdCgroup"`
BinaryName string `toml:"BinaryName"`
} `toml:"options"`
}
type Config struct {
Version int `toml:"version"`
Root string `toml:"root"`
Expand All @@ -173,18 +182,9 @@ func (runtime *ContainerdRuntime) processConfigFile() (string, error) {
MaxContainerLogLineSize int `toml:"max_container_log_line_size"`
MaxConcurrentDownloads int `toml:"max_concurrent_downloads"`
Containerd struct {
Snapshotter string `toml:"snapshotter"`
DefaultRuntimeName string `toml:"default_runtime_name"`
Runtimes struct {
Runc struct {
RuntimeType string `toml:"runtime_type"`
RuntimeEngine string `toml:"runtime_engine"`
RuntimeRoot string `toml:"runtime_root"`
Options struct {
SystemdCgroup bool `toml:"SystemdCgroup"`
} `toml:"options"`
} `toml:"runc"`
} `toml:"runtimes"`
Snapshotter string `toml:"snapshotter"`
DefaultRuntimeName string `toml:"default_runtime_name"`
Runtimes map[string]Runtime `toml:"runtimes"`
} `toml:"containerd"`
} `toml:"io.containerd.grpc.v1.cri"`
} `toml:"plugins"`
Expand All @@ -199,8 +199,12 @@ func (runtime *ContainerdRuntime) processConfigFile() (string, error) {
if err != nil {
return "", err
}
if config.Plugins.IoContainerdGrpcV1Cri.Containerd.Runtimes.Runc.Options.SystemdCgroup {
return DefaultSystemdCgroupDriver, nil
defaultRuntime := config.Plugins.IoContainerdGrpcV1Cri.Containerd.DefaultRuntimeName
containerRuntime, ok := config.Plugins.IoContainerdGrpcV1Cri.Containerd.Runtimes[defaultRuntime]
if ok {
if containerRuntime.Options.SystemdCgroup {
return DefaultSystemdCgroupDriver, nil
}
}
}
return DefaultCgroupDriver, nil
Expand Down