Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion nogo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ global:
exclude:
# Generated: exempt all.
- pkg/shim/v1/runtimeoptions/runtimeoptions_cri.go
- pkg/shim/v1/runtimeoptions/v14/runtimeoptions_cri.go
analyzers:
asmdecl:
generated: # Enabled.
Expand Down
1 change: 0 additions & 1 deletion pkg/shim/v1/runsc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ go_library(
"//pkg/shim/v1/proc",
"//pkg/shim/v1/runsccmd",
"//pkg/shim/v1/runtimeoptions",
"//pkg/shim/v1/runtimeoptions/v14",
"//pkg/shim/v1/utils",
"//runsc/specutils",
"@com_github_burntsushi_toml//:go_default_library",
Expand Down
29 changes: 0 additions & 29 deletions pkg/shim/v1/runsc/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/cleanup"
"gvisor.dev/gvisor/pkg/shim/v1/runtimeoptions/v14"

"gvisor.dev/gvisor/pkg/shim/v1/extension"
"gvisor.dev/gvisor/pkg/shim/v1/proc"
Expand Down Expand Up @@ -219,26 +218,6 @@ func (s *runscService) Create(ctx context.Context, r *taskAPI.CreateTaskRequest)
}
var path string
switch o := v.(type) {
case *runctypes.CreateOptions: // containerd 1.2.x
s.opts.IoUID = o.IoUid
s.opts.IoGID = o.IoGid
s.opts.ShimCgroup = o.ShimCgroup
case *runctypes.RuncOptions: // containerd 1.2.x
root := proc.RunscRoot
if o.RuntimeRoot != "" {
root = o.RuntimeRoot
}

s.opts.BinaryName = o.Runtime

path = filepath.Join(root, configFile)
if _, err := os.Stat(path); err != nil {
if !os.IsNotExist(err) {
return nil, fmt.Errorf("stat config file %q: %w", path, err)
}
// A config file in runtime root is not required.
path = ""
}
case *runtimeoptions.Options: // containerd 1.5+
if o.ConfigPath == "" {
break
Expand All @@ -247,14 +226,6 @@ func (s *runscService) Create(ctx context.Context, r *taskAPI.CreateTaskRequest)
return nil, fmt.Errorf("unsupported option type %q", o.TypeUrl)
}
path = o.ConfigPath
case *v14.Options: // containerd 1.4-
if o.ConfigPath == "" {
break
}
if o.TypeUrl != optionsType {
return nil, fmt.Errorf("unsupported option type %q", o.TypeUrl)
}
path = o.ConfigPath
default:
return nil, fmt.Errorf("unsupported option type %q", r.Options.TypeUrl)
}
Expand Down
35 changes: 0 additions & 35 deletions pkg/shim/v1/runtimeoptions/v14/BUILD

This file was deleted.

20 changes: 0 additions & 20 deletions pkg/shim/v1/runtimeoptions/v14/runtimeoptions.go

This file was deleted.

29 changes: 0 additions & 29 deletions pkg/shim/v1/runtimeoptions/v14/runtimeoptions.proto

This file was deleted.

Loading