full diff: https://github.com/containerd/containerd/compare/v1.7.24...v1.7.25
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
"path/filepath" |
| 12 | 12 |
"strings" |
| 13 | 13 |
|
| 14 |
- v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 14 |
+ runcoptions "github.com/containerd/containerd/api/types/runc/options" |
|
| 15 | 15 |
"github.com/containerd/log" |
| 16 | 16 |
"github.com/docker/docker/api/types" |
| 17 | 17 |
containertypes "github.com/docker/docker/api/types/container" |
| ... | ... |
@@ -387,7 +387,7 @@ func parseDefaultRuntimeVersion(rts *runtimes) (runtime, version, commit string, |
| 387 | 387 |
if err != nil {
|
| 388 | 388 |
return "", "", "", err |
| 389 | 389 |
} |
| 390 |
- shimopts, ok := opts.(*v2runcoptions.Options) |
|
| 390 |
+ shimopts, ok := opts.(*runcoptions.Options) |
|
| 391 | 391 |
if !ok {
|
| 392 | 392 |
return "", "", "", fmt.Errorf("%s: retrieving version not supported", shim)
|
| 393 | 393 |
} |
| ... | ... |
@@ -15,8 +15,8 @@ import ( |
| 15 | 15 |
"path/filepath" |
| 16 | 16 |
"strings" |
| 17 | 17 |
|
| 18 |
+ runcoptions "github.com/containerd/containerd/api/types/runc/options" |
|
| 18 | 19 |
"github.com/containerd/containerd/plugin" |
| 19 |
- v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 20 | 20 |
"github.com/containerd/log" |
| 21 | 21 |
"github.com/docker/docker/daemon/config" |
| 22 | 22 |
"github.com/docker/docker/errdefs" |
| ... | ... |
@@ -57,7 +57,7 @@ func stockRuntimes() map[string]string {
|
| 57 | 57 |
func defaultV2ShimConfig(conf *config.Config, runtimePath string) *shimConfig {
|
| 58 | 58 |
shim := &shimConfig{
|
| 59 | 59 |
Shim: plugin.RuntimeRuncV2, |
| 60 |
- Opts: &v2runcoptions.Options{
|
|
| 60 |
+ Opts: &runcoptions.Options{
|
|
| 61 | 61 |
BinaryName: runtimePath, |
| 62 | 62 |
Root: filepath.Join(conf.ExecRoot, "runtime-"+defaultRuntimeName), |
| 63 | 63 |
SystemdCgroup: UsingSystemd(conf), |
| ... | ... |
@@ -9,9 +9,9 @@ import ( |
| 9 | 9 |
"testing" |
| 10 | 10 |
|
| 11 | 11 |
"dario.cat/mergo" |
| 12 |
- runtimeoptions_v1 "github.com/containerd/containerd/pkg/runtimeoptions/v1" |
|
| 12 |
+ runcoptions "github.com/containerd/containerd/api/types/runc/options" |
|
| 13 |
+ runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" |
|
| 13 | 14 |
"github.com/containerd/containerd/plugin" |
| 14 |
- v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 15 | 15 |
"github.com/docker/docker/api/types/system" |
| 16 | 16 |
"github.com/docker/docker/daemon/config" |
| 17 | 17 |
"github.com/docker/docker/errdefs" |
| ... | ... |
@@ -243,7 +243,7 @@ func TestGetRuntime(t *testing.T) {
|
| 243 | 243 |
assert.Assert(t, ok, "stock runtime could not be found (test needs to be updated)") |
| 244 | 244 |
stockRuntime.Features = nil |
| 245 | 245 |
|
| 246 |
- configdOpts := proto.Clone(stockRuntime.Opts.(*v2runcoptions.Options)).(*v2runcoptions.Options) |
|
| 246 |
+ configdOpts := proto.Clone(stockRuntime.Opts.(*runcoptions.Options)).(*runcoptions.Options) |
|
| 247 | 247 |
configdOpts.BinaryName = configuredRuntime.Path |
| 248 | 248 |
wantConfigdRuntime := &shimConfig{
|
| 249 | 249 |
Shim: stockRuntime.Shim, |
| ... | ... |
@@ -304,7 +304,7 @@ func TestGetRuntime(t *testing.T) {
|
| 304 | 304 |
runtime: shimWithOptsName, |
| 305 | 305 |
want: &shimConfig{
|
| 306 | 306 |
Shim: shimWithOpts.Type, |
| 307 |
- Opts: &v2runcoptions.Options{IoUid: 42},
|
|
| 307 |
+ Opts: &runcoptions.Options{IoUid: 42},
|
|
| 308 | 308 |
}, |
| 309 | 309 |
}, |
| 310 | 310 |
{
|
| ... | ... |
@@ -322,7 +322,7 @@ func TestGetRuntime(t *testing.T) {
|
| 322 | 322 |
runtime: gvisorName, |
| 323 | 323 |
want: &shimConfig{
|
| 324 | 324 |
Shim: gvisorRuntime.Type, |
| 325 |
- Opts: &runtimeoptions_v1.Options{
|
|
| 325 |
+ Opts: &runtimeoptions.Options{
|
|
| 326 | 326 |
TypeUrl: gvisorRuntime.Options["TypeUrl"].(string), |
| 327 | 327 |
ConfigPath: gvisorRuntime.Options["ConfigPath"].(string), |
| 328 | 328 |
}, |
| ... | ... |
@@ -335,8 +335,8 @@ func TestGetRuntime(t *testing.T) {
|
| 335 | 335 |
assert.Check(t, err) |
| 336 | 336 |
got := &shimConfig{Shim: shim, Opts: opts}
|
| 337 | 337 |
assert.Check(t, is.DeepEqual(got, tc.want, |
| 338 |
- cmpopts.IgnoreUnexported(runtimeoptions_v1.Options{}),
|
|
| 339 |
- cmpopts.IgnoreUnexported(v2runcoptions.Options{}),
|
|
| 338 |
+ cmpopts.IgnoreUnexported(runtimeoptions.Options{}),
|
|
| 339 |
+ cmpopts.IgnoreUnexported(runcoptions.Options{}),
|
|
| 340 | 340 |
)) |
| 341 | 341 |
} else {
|
| 342 | 342 |
assert.Check(t, is.Equal(shim, "")) |
| ... | ... |
@@ -349,7 +349,7 @@ func TestGetRuntime(t *testing.T) {
|
| 349 | 349 |
shim, opts, err := runtimes.Get(rtWithArgsName) |
| 350 | 350 |
assert.Check(t, err) |
| 351 | 351 |
assert.Check(t, is.Equal(shim, stockRuntime.Shim)) |
| 352 |
- runcopts, ok := opts.(*v2runcoptions.Options) |
|
| 352 |
+ runcopts, ok := opts.(*runcoptions.Options) |
|
| 353 | 353 |
if assert.Check(t, ok, "runtimes.Get() opts = type %T, want *v2runcoptions.Options", opts) {
|
| 354 | 354 |
wrapper, err := os.ReadFile(runcopts.BinaryName) |
| 355 | 355 |
if assert.Check(t, err) {
|
| ... | ... |
@@ -426,7 +426,7 @@ func TestRuntimeWrapping(t *testing.T) {
|
| 426 | 426 |
for name := range cfg.Runtimes {
|
| 427 | 427 |
_, opts, err := rt.Get(name) |
| 428 | 428 |
if assert.Check(t, err, "rt.Get(%q)", name) {
|
| 429 |
- binary := opts.(*v2runcoptions.Options).BinaryName |
|
| 429 |
+ binary := opts.(*runcoptions.Options).BinaryName |
|
| 430 | 430 |
content, err := os.ReadFile(binary) |
| 431 | 431 |
assert.Check(t, err, "could not read wrapper script contents for runtime %q", binary) |
| 432 | 432 |
wrappers[name] = WrapperInfo{BinaryName: binary, Content: string(content)}
|
| ... | ... |
@@ -16,12 +16,12 @@ import ( |
| 16 | 16 |
"github.com/containerd/containerd" |
| 17 | 17 |
apievents "github.com/containerd/containerd/api/events" |
| 18 | 18 |
"github.com/containerd/containerd/api/types" |
| 19 |
+ runcoptions "github.com/containerd/containerd/api/types/runc/options" |
|
| 19 | 20 |
"github.com/containerd/containerd/archive" |
| 20 | 21 |
"github.com/containerd/containerd/cio" |
| 21 | 22 |
"github.com/containerd/containerd/content" |
| 22 | 23 |
c8dimages "github.com/containerd/containerd/images" |
| 23 | 24 |
"github.com/containerd/containerd/protobuf" |
| 24 |
- v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 25 | 25 |
cerrdefs "github.com/containerd/errdefs" |
| 26 | 26 |
"github.com/containerd/log" |
| 27 | 27 |
"github.com/containerd/typeurl/v2" |
| ... | ... |
@@ -57,7 +57,7 @@ type container struct {
|
| 57 | 57 |
client *client |
| 58 | 58 |
c8dCtr containerd.Container |
| 59 | 59 |
|
| 60 |
- v2runcoptions *v2runcoptions.Options |
|
| 60 |
+ v2runcoptions *runcoptions.Options |
|
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 | 63 |
type task struct {
|
| ... | ... |
@@ -140,7 +140,7 @@ func (c *client) NewContainer(ctx context.Context, id string, ociSpec *specs.Spe |
| 140 | 140 |
client: c, |
| 141 | 141 |
c8dCtr: ctr, |
| 142 | 142 |
} |
| 143 |
- if x, ok := runtimeOptions.(*v2runcoptions.Options); ok {
|
|
| 143 |
+ if x, ok := runtimeOptions.(*runcoptions.Options); ok {
|
|
| 144 | 144 |
created.v2runcoptions = x |
| 145 | 145 |
} |
| 146 | 146 |
return &created, nil |
| ... | ... |
@@ -208,7 +208,7 @@ func (c *container) NewTask(ctx context.Context, checkpointDir string, withStdin |
| 208 | 208 |
if runtime.GOOS != "windows" {
|
| 209 | 209 |
taskOpts = append(taskOpts, func(_ context.Context, _ *containerd.Client, info *containerd.TaskInfo) error {
|
| 210 | 210 |
if c.v2runcoptions != nil {
|
| 211 |
- opts := proto.Clone(c.v2runcoptions).(*v2runcoptions.Options) |
|
| 211 |
+ opts := proto.Clone(c.v2runcoptions).(*runcoptions.Options) |
|
| 212 | 212 |
opts.IoUid = uint32(uid) |
| 213 | 213 |
opts.IoGid = uint32(gid) |
| 214 | 214 |
info.Options = opts |
| ... | ... |
@@ -411,11 +411,11 @@ func (p process) Status(ctx context.Context) (containerd.Status, error) {
|
| 411 | 411 |
func (c *container) getCheckpointOptions(exit bool) containerd.CheckpointTaskOpts {
|
| 412 | 412 |
return func(r *containerd.CheckpointTaskInfo) error {
|
| 413 | 413 |
if r.Options == nil && c.v2runcoptions != nil {
|
| 414 |
- r.Options = &v2runcoptions.CheckpointOptions{}
|
|
| 414 |
+ r.Options = &runcoptions.CheckpointOptions{}
|
|
| 415 | 415 |
} |
| 416 | 416 |
|
| 417 | 417 |
switch opts := r.Options.(type) {
|
| 418 |
- case *v2runcoptions.CheckpointOptions: |
|
| 418 |
+ case *runcoptions.CheckpointOptions: |
|
| 419 | 419 |
opts.Exit = exit |
| 420 | 420 |
} |
| 421 | 421 |
|
| ... | ... |
@@ -2,9 +2,9 @@ package shimopts |
| 2 | 2 |
|
| 3 | 3 |
import ( |
| 4 | 4 |
runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" |
| 5 |
+ runcoptions "github.com/containerd/containerd/api/types/runc/options" |
|
| 5 | 6 |
runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" |
| 6 | 7 |
"github.com/containerd/containerd/plugin" |
| 7 |
- runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 8 | 8 |
"github.com/pelletier/go-toml" |
| 9 | 9 |
) |
| 10 | 10 |
|
| ... | ... |
@@ -26,7 +26,7 @@ require ( |
| 26 | 26 |
github.com/aws/smithy-go v1.19.0 |
| 27 | 27 |
github.com/cloudflare/cfssl v1.6.4 |
| 28 | 28 |
github.com/containerd/cgroups/v3 v3.0.5 |
| 29 |
- github.com/containerd/containerd v1.7.24 |
|
| 29 |
+ github.com/containerd/containerd v1.7.25 |
|
| 30 | 30 |
github.com/containerd/containerd/api v1.8.0 |
| 31 | 31 |
github.com/containerd/continuity v0.4.5 |
| 32 | 32 |
github.com/containerd/errdefs v0.3.0 |
| ... | ... |
@@ -111,8 +111,8 @@ github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJ |
| 111 | 111 |
github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= |
| 112 | 112 |
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= |
| 113 | 113 |
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= |
| 114 |
-github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA= |
|
| 115 |
-github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= |
|
| 114 |
+github.com/containerd/containerd v1.7.25 h1:khEQOAXOEJalRO228yzVsuASLH42vT7DIo9Ss+9SMFQ= |
|
| 115 |
+github.com/containerd/containerd v1.7.25/go.mod h1:tWfHzVI0azhw4CT2vaIjsb2CoV4LJ9PrMPaULAr21Ok= |
|
| 116 | 116 |
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= |
| 117 | 117 |
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= |
| 118 | 118 |
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= |
| ... | ... |
@@ -115,6 +115,7 @@ make generate |
| 115 | 115 |
> * `no_btrfs`: A build tag disables building the Btrfs snapshot driver. |
| 116 | 116 |
> * `no_devmapper`: A build tag disables building the device mapper snapshot driver. |
| 117 | 117 |
> * `no_zfs`: A build tag disables building the ZFS snapshot driver. |
| 118 |
+> * `no_dynamic_plugins`: A build tag disables dynamic plugins. |
|
| 118 | 119 |
> |
| 119 | 120 |
> For example, adding `BUILDTAGS=no_btrfs` to your environment before calling the **binaries** |
| 120 | 121 |
> Makefile target will disable the btrfs driver within the containerd Go build. |
| ... | ... |
@@ -106,7 +106,6 @@ SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version |
| 106 | 106 |
|
| 107 | 107 |
# Project packages. |
| 108 | 108 |
PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration)
|
| 109 |
-API_PACKAGES=$(shell (cd api && $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration))
|
|
| 110 | 109 |
NON_API_PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration | grep -v "containerd/api")
|
| 111 | 110 |
TEST_REQUIRES_ROOT_PACKAGES=$(filter \ |
| 112 | 111 |
${PACKAGES}, \
|
| ... | ... |
@@ -174,14 +173,8 @@ protos: bin/protoc-gen-go-fieldpath |
| 174 | 174 |
@echo "$(WHALE) $@" |
| 175 | 175 |
@find . -path ./vendor -prune -false -o -name '*.pb.go' | xargs rm |
| 176 | 176 |
$(eval TMPDIR := $(shell mktemp -d)) |
| 177 |
- @mv ${ROOTDIR}/vendor ${TMPDIR}
|
|
| 178 |
- @(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES})
|
|
| 179 | 177 |
@(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_API_PACKAGES})
|
| 180 |
- @mv ${TMPDIR}/vendor ${ROOTDIR}
|
|
| 181 |
- @rm -rf ${TMPDIR}
|
|
| 182 |
- go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go') |
|
| 183 |
- @test -z "$$(git status --short | grep "api/next.pb.txt" | tee /dev/stderr)" || \ |
|
| 184 |
- $(GO) mod edit -replace=github.com/containerd/containerd/api=./api |
|
| 178 |
+ go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find runtime/ -name '*.pb.go') |
|
| 185 | 179 |
|
| 186 | 180 |
check-protos: protos ## check if protobufs needs to be generated again |
| 187 | 181 |
@echo "$(WHALE) $@" |
| ... | ... |
@@ -482,14 +475,12 @@ vendor: ## ensure all the go.mod/go.sum files are up-to-date including vendor/ d |
| 482 | 482 |
@$(GO) mod vendor |
| 483 | 483 |
@$(GO) mod verify |
| 484 | 484 |
@(cd ${ROOTDIR}/integration/client && ${GO} mod tidy)
|
| 485 |
- @(cd ${ROOTDIR}/api && ${GO} mod tidy)
|
|
| 486 | 485 |
|
| 487 | 486 |
verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date |
| 488 | 487 |
@echo "$(WHALE) $@" |
| 489 | 488 |
$(eval TMPDIR := $(shell mktemp -d)) |
| 490 | 489 |
@cp -R ${ROOTDIR} ${TMPDIR}
|
| 491 | 490 |
@(cd ${TMPDIR}/containerd && ${GO} mod tidy)
|
| 492 |
- @(cd ${TMPDIR}/containerd/api && ${GO} mod tidy)
|
|
| 493 | 491 |
@(cd ${TMPDIR}/containerd/integration/client && ${GO} mod tidy)
|
| 494 | 492 |
@diff -r -u -q ${ROOTDIR} ${TMPDIR}/containerd
|
| 495 | 493 |
@rm -rf ${TMPDIR}
|
| ... | ... |
@@ -6,7 +6,7 @@ generators = ["go"] |
| 6 | 6 |
[includes] |
| 7 | 7 |
# Include paths that will be added before all others. Typically, you want to |
| 8 | 8 |
# treat the root of the project as an include, but this may not be necessary. |
| 9 |
- before = ["./protobuf"] |
|
| 9 |
+ before = ["./protobuf", "./vendor"] |
|
| 10 | 10 |
|
| 11 | 11 |
# Paths that will be added untouched to the end of the includes. We use |
| 12 | 12 |
# `/usr/local/include` to pickup the common install location of protobuf. |
| ... | ... |
@@ -35,10 +35,3 @@ target = "runtime/linux/runctypes/next.pb.txt" |
| 35 | 35 |
ignore_files = [ |
| 36 | 36 |
"google/protobuf/descriptor.proto", |
| 37 | 37 |
] |
| 38 |
- |
|
| 39 |
-[[descriptors]] |
|
| 40 |
-prefix = "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 41 |
-target = "runtime/v2/runc/options/next.pb.txt" |
|
| 42 |
-ignore_files = [ |
|
| 43 |
- "google/protobuf/descriptor.proto", |
|
| 44 |
-] |
| ... | ... |
@@ -104,7 +104,7 @@ EOF |
| 104 | 104 |
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| |
| 105 | 105 |
sh.upload_path = "/tmp/vagrant-install-golang" |
| 106 | 106 |
sh.env = {
|
| 107 |
- 'GO_VERSION': ENV['GO_VERSION'] || "1.22.9", |
|
| 107 |
+ 'GO_VERSION': ENV['GO_VERSION'] || "1.22.10", |
|
| 108 | 108 |
} |
| 109 | 109 |
sh.inline = <<~SHELL |
| 110 | 110 |
#!/usr/bin/env bash |
| 111 | 111 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,17 @@ |
| 0 |
+/* |
|
| 1 |
+ Copyright The containerd Authors. |
|
| 2 |
+ |
|
| 3 |
+ Licensed under the Apache License, Version 2.0 (the "License"); |
|
| 4 |
+ you may not use this file except in compliance with the License. |
|
| 5 |
+ You may obtain a copy of the License at |
|
| 6 |
+ |
|
| 7 |
+ http://www.apache.org/licenses/LICENSE-2.0 |
|
| 8 |
+ |
|
| 9 |
+ Unless required by applicable law or agreed to in writing, software |
|
| 10 |
+ distributed under the License is distributed on an "AS IS" BASIS, |
|
| 11 |
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
| 12 |
+ See the License for the specific language governing permissions and |
|
| 13 |
+ limitations under the License. |
|
| 14 |
+*/ |
|
| 15 |
+ |
|
| 16 |
+package options |
| 0 | 17 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,175 @@ |
| 0 |
+file {
|
|
| 1 |
+ name: "github.com/containerd/containerd/core/runtime/v2/runc/options/oci.proto" |
|
| 2 |
+ package: "containerd.runc.v1" |
|
| 3 |
+ message_type {
|
|
| 4 |
+ name: "Options" |
|
| 5 |
+ field {
|
|
| 6 |
+ name: "no_pivot_root" |
|
| 7 |
+ number: 1 |
|
| 8 |
+ label: LABEL_OPTIONAL |
|
| 9 |
+ type: TYPE_BOOL |
|
| 10 |
+ json_name: "noPivotRoot" |
|
| 11 |
+ } |
|
| 12 |
+ field {
|
|
| 13 |
+ name: "no_new_keyring" |
|
| 14 |
+ number: 2 |
|
| 15 |
+ label: LABEL_OPTIONAL |
|
| 16 |
+ type: TYPE_BOOL |
|
| 17 |
+ json_name: "noNewKeyring" |
|
| 18 |
+ } |
|
| 19 |
+ field {
|
|
| 20 |
+ name: "shim_cgroup" |
|
| 21 |
+ number: 3 |
|
| 22 |
+ label: LABEL_OPTIONAL |
|
| 23 |
+ type: TYPE_STRING |
|
| 24 |
+ json_name: "shimCgroup" |
|
| 25 |
+ } |
|
| 26 |
+ field {
|
|
| 27 |
+ name: "io_uid" |
|
| 28 |
+ number: 4 |
|
| 29 |
+ label: LABEL_OPTIONAL |
|
| 30 |
+ type: TYPE_UINT32 |
|
| 31 |
+ json_name: "ioUid" |
|
| 32 |
+ } |
|
| 33 |
+ field {
|
|
| 34 |
+ name: "io_gid" |
|
| 35 |
+ number: 5 |
|
| 36 |
+ label: LABEL_OPTIONAL |
|
| 37 |
+ type: TYPE_UINT32 |
|
| 38 |
+ json_name: "ioGid" |
|
| 39 |
+ } |
|
| 40 |
+ field {
|
|
| 41 |
+ name: "binary_name" |
|
| 42 |
+ number: 6 |
|
| 43 |
+ label: LABEL_OPTIONAL |
|
| 44 |
+ type: TYPE_STRING |
|
| 45 |
+ json_name: "binaryName" |
|
| 46 |
+ } |
|
| 47 |
+ field {
|
|
| 48 |
+ name: "root" |
|
| 49 |
+ number: 7 |
|
| 50 |
+ label: LABEL_OPTIONAL |
|
| 51 |
+ type: TYPE_STRING |
|
| 52 |
+ json_name: "root" |
|
| 53 |
+ } |
|
| 54 |
+ field {
|
|
| 55 |
+ name: "systemd_cgroup" |
|
| 56 |
+ number: 9 |
|
| 57 |
+ label: LABEL_OPTIONAL |
|
| 58 |
+ type: TYPE_BOOL |
|
| 59 |
+ json_name: "systemdCgroup" |
|
| 60 |
+ } |
|
| 61 |
+ field {
|
|
| 62 |
+ name: "criu_image_path" |
|
| 63 |
+ number: 10 |
|
| 64 |
+ label: LABEL_OPTIONAL |
|
| 65 |
+ type: TYPE_STRING |
|
| 66 |
+ json_name: "criuImagePath" |
|
| 67 |
+ } |
|
| 68 |
+ field {
|
|
| 69 |
+ name: "criu_work_path" |
|
| 70 |
+ number: 11 |
|
| 71 |
+ label: LABEL_OPTIONAL |
|
| 72 |
+ type: TYPE_STRING |
|
| 73 |
+ json_name: "criuWorkPath" |
|
| 74 |
+ } |
|
| 75 |
+ field {
|
|
| 76 |
+ name: "task_api_address" |
|
| 77 |
+ number: 12 |
|
| 78 |
+ label: LABEL_OPTIONAL |
|
| 79 |
+ type: TYPE_STRING |
|
| 80 |
+ json_name: "taskApiAddress" |
|
| 81 |
+ } |
|
| 82 |
+ field {
|
|
| 83 |
+ name: "task_api_version" |
|
| 84 |
+ number: 13 |
|
| 85 |
+ label: LABEL_OPTIONAL |
|
| 86 |
+ type: TYPE_UINT32 |
|
| 87 |
+ json_name: "taskApiVersion" |
|
| 88 |
+ } |
|
| 89 |
+ reserved_range {
|
|
| 90 |
+ start: 8 |
|
| 91 |
+ end: 9 |
|
| 92 |
+ } |
|
| 93 |
+ } |
|
| 94 |
+ message_type {
|
|
| 95 |
+ name: "CheckpointOptions" |
|
| 96 |
+ field {
|
|
| 97 |
+ name: "exit" |
|
| 98 |
+ number: 1 |
|
| 99 |
+ label: LABEL_OPTIONAL |
|
| 100 |
+ type: TYPE_BOOL |
|
| 101 |
+ json_name: "exit" |
|
| 102 |
+ } |
|
| 103 |
+ field {
|
|
| 104 |
+ name: "open_tcp" |
|
| 105 |
+ number: 2 |
|
| 106 |
+ label: LABEL_OPTIONAL |
|
| 107 |
+ type: TYPE_BOOL |
|
| 108 |
+ json_name: "openTcp" |
|
| 109 |
+ } |
|
| 110 |
+ field {
|
|
| 111 |
+ name: "external_unix_sockets" |
|
| 112 |
+ number: 3 |
|
| 113 |
+ label: LABEL_OPTIONAL |
|
| 114 |
+ type: TYPE_BOOL |
|
| 115 |
+ json_name: "externalUnixSockets" |
|
| 116 |
+ } |
|
| 117 |
+ field {
|
|
| 118 |
+ name: "terminal" |
|
| 119 |
+ number: 4 |
|
| 120 |
+ label: LABEL_OPTIONAL |
|
| 121 |
+ type: TYPE_BOOL |
|
| 122 |
+ json_name: "terminal" |
|
| 123 |
+ } |
|
| 124 |
+ field {
|
|
| 125 |
+ name: "file_locks" |
|
| 126 |
+ number: 5 |
|
| 127 |
+ label: LABEL_OPTIONAL |
|
| 128 |
+ type: TYPE_BOOL |
|
| 129 |
+ json_name: "fileLocks" |
|
| 130 |
+ } |
|
| 131 |
+ field {
|
|
| 132 |
+ name: "empty_namespaces" |
|
| 133 |
+ number: 6 |
|
| 134 |
+ label: LABEL_REPEATED |
|
| 135 |
+ type: TYPE_STRING |
|
| 136 |
+ json_name: "emptyNamespaces" |
|
| 137 |
+ } |
|
| 138 |
+ field {
|
|
| 139 |
+ name: "cgroups_mode" |
|
| 140 |
+ number: 7 |
|
| 141 |
+ label: LABEL_OPTIONAL |
|
| 142 |
+ type: TYPE_STRING |
|
| 143 |
+ json_name: "cgroupsMode" |
|
| 144 |
+ } |
|
| 145 |
+ field {
|
|
| 146 |
+ name: "image_path" |
|
| 147 |
+ number: 8 |
|
| 148 |
+ label: LABEL_OPTIONAL |
|
| 149 |
+ type: TYPE_STRING |
|
| 150 |
+ json_name: "imagePath" |
|
| 151 |
+ } |
|
| 152 |
+ field {
|
|
| 153 |
+ name: "work_path" |
|
| 154 |
+ number: 9 |
|
| 155 |
+ label: LABEL_OPTIONAL |
|
| 156 |
+ type: TYPE_STRING |
|
| 157 |
+ json_name: "workPath" |
|
| 158 |
+ } |
|
| 159 |
+ } |
|
| 160 |
+ message_type {
|
|
| 161 |
+ name: "ProcessDetails" |
|
| 162 |
+ field {
|
|
| 163 |
+ name: "exec_id" |
|
| 164 |
+ number: 1 |
|
| 165 |
+ label: LABEL_OPTIONAL |
|
| 166 |
+ type: TYPE_STRING |
|
| 167 |
+ json_name: "execId" |
|
| 168 |
+ } |
|
| 169 |
+ } |
|
| 170 |
+ options {
|
|
| 171 |
+ go_package: "github.com/containerd/containerd/v2/core/runtime/v2/runc/options;options" |
|
| 172 |
+ } |
|
| 173 |
+ syntax: "proto3" |
|
| 174 |
+} |
| 0 | 175 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,491 @@ |
| 0 |
+// Code generated by protoc-gen-go. DO NOT EDIT. |
|
| 1 |
+// versions: |
|
| 2 |
+// protoc-gen-go v1.28.1 |
|
| 3 |
+// protoc v3.20.1 |
|
| 4 |
+// source: github.com/containerd/containerd/api/types/runc/options/oci.proto |
|
| 5 |
+ |
|
| 6 |
+package options |
|
| 7 |
+ |
|
| 8 |
+import ( |
|
| 9 |
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect" |
|
| 10 |
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl" |
|
| 11 |
+ reflect "reflect" |
|
| 12 |
+ sync "sync" |
|
| 13 |
+) |
|
| 14 |
+ |
|
| 15 |
+const ( |
|
| 16 |
+ // Verify that this generated code is sufficiently up-to-date. |
|
| 17 |
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) |
|
| 18 |
+ // Verify that runtime/protoimpl is sufficiently up-to-date. |
|
| 19 |
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) |
|
| 20 |
+) |
|
| 21 |
+ |
|
| 22 |
+type Options struct {
|
|
| 23 |
+ state protoimpl.MessageState |
|
| 24 |
+ sizeCache protoimpl.SizeCache |
|
| 25 |
+ unknownFields protoimpl.UnknownFields |
|
| 26 |
+ |
|
| 27 |
+ // disable pivot root when creating a container |
|
| 28 |
+ NoPivotRoot bool `protobuf:"varint,1,opt,name=no_pivot_root,json=noPivotRoot,proto3" json:"no_pivot_root,omitempty"` |
|
| 29 |
+ // create a new keyring for the container |
|
| 30 |
+ NoNewKeyring bool `protobuf:"varint,2,opt,name=no_new_keyring,json=noNewKeyring,proto3" json:"no_new_keyring,omitempty"` |
|
| 31 |
+ // place the shim in a cgroup |
|
| 32 |
+ ShimCgroup string `protobuf:"bytes,3,opt,name=shim_cgroup,json=shimCgroup,proto3" json:"shim_cgroup,omitempty"` |
|
| 33 |
+ // set the I/O's pipes uid |
|
| 34 |
+ IoUid uint32 `protobuf:"varint,4,opt,name=io_uid,json=ioUid,proto3" json:"io_uid,omitempty"` |
|
| 35 |
+ // set the I/O's pipes gid |
|
| 36 |
+ IoGid uint32 `protobuf:"varint,5,opt,name=io_gid,json=ioGid,proto3" json:"io_gid,omitempty"` |
|
| 37 |
+ // binary name of the runc binary |
|
| 38 |
+ BinaryName string `protobuf:"bytes,6,opt,name=binary_name,json=binaryName,proto3" json:"binary_name,omitempty"` |
|
| 39 |
+ // runc root directory |
|
| 40 |
+ Root string `protobuf:"bytes,7,opt,name=root,proto3" json:"root,omitempty"` |
|
| 41 |
+ // enable systemd cgroups |
|
| 42 |
+ SystemdCgroup bool `protobuf:"varint,9,opt,name=systemd_cgroup,json=systemdCgroup,proto3" json:"systemd_cgroup,omitempty"` |
|
| 43 |
+ // criu image path |
|
| 44 |
+ CriuImagePath string `protobuf:"bytes,10,opt,name=criu_image_path,json=criuImagePath,proto3" json:"criu_image_path,omitempty"` |
|
| 45 |
+ // criu work path |
|
| 46 |
+ CriuWorkPath string `protobuf:"bytes,11,opt,name=criu_work_path,json=criuWorkPath,proto3" json:"criu_work_path,omitempty"` |
|
| 47 |
+ // task api address, can be a unix domain socket, or vsock address. |
|
| 48 |
+ // it is in the form of ttrpc+unix://path/to/uds or grpc+vsock://<vsock cid>:<port>. |
|
| 49 |
+ TaskApiAddress string `protobuf:"bytes,12,opt,name=task_api_address,json=taskApiAddress,proto3" json:"task_api_address,omitempty"` |
|
| 50 |
+ // task api version, currently supported value is 2 and 3. |
|
| 51 |
+ TaskApiVersion uint32 `protobuf:"varint,13,opt,name=task_api_version,json=taskApiVersion,proto3" json:"task_api_version,omitempty"` |
|
| 52 |
+} |
|
| 53 |
+ |
|
| 54 |
+func (x *Options) Reset() {
|
|
| 55 |
+ *x = Options{}
|
|
| 56 |
+ if protoimpl.UnsafeEnabled {
|
|
| 57 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[0] |
|
| 58 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 59 |
+ ms.StoreMessageInfo(mi) |
|
| 60 |
+ } |
|
| 61 |
+} |
|
| 62 |
+ |
|
| 63 |
+func (x *Options) String() string {
|
|
| 64 |
+ return protoimpl.X.MessageStringOf(x) |
|
| 65 |
+} |
|
| 66 |
+ |
|
| 67 |
+func (*Options) ProtoMessage() {}
|
|
| 68 |
+ |
|
| 69 |
+func (x *Options) ProtoReflect() protoreflect.Message {
|
|
| 70 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[0] |
|
| 71 |
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
| 72 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 73 |
+ if ms.LoadMessageInfo() == nil {
|
|
| 74 |
+ ms.StoreMessageInfo(mi) |
|
| 75 |
+ } |
|
| 76 |
+ return ms |
|
| 77 |
+ } |
|
| 78 |
+ return mi.MessageOf(x) |
|
| 79 |
+} |
|
| 80 |
+ |
|
| 81 |
+// Deprecated: Use Options.ProtoReflect.Descriptor instead. |
|
| 82 |
+func (*Options) Descriptor() ([]byte, []int) {
|
|
| 83 |
+ return file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescGZIP(), []int{0}
|
|
| 84 |
+} |
|
| 85 |
+ |
|
| 86 |
+func (x *Options) GetNoPivotRoot() bool {
|
|
| 87 |
+ if x != nil {
|
|
| 88 |
+ return x.NoPivotRoot |
|
| 89 |
+ } |
|
| 90 |
+ return false |
|
| 91 |
+} |
|
| 92 |
+ |
|
| 93 |
+func (x *Options) GetNoNewKeyring() bool {
|
|
| 94 |
+ if x != nil {
|
|
| 95 |
+ return x.NoNewKeyring |
|
| 96 |
+ } |
|
| 97 |
+ return false |
|
| 98 |
+} |
|
| 99 |
+ |
|
| 100 |
+func (x *Options) GetShimCgroup() string {
|
|
| 101 |
+ if x != nil {
|
|
| 102 |
+ return x.ShimCgroup |
|
| 103 |
+ } |
|
| 104 |
+ return "" |
|
| 105 |
+} |
|
| 106 |
+ |
|
| 107 |
+func (x *Options) GetIoUid() uint32 {
|
|
| 108 |
+ if x != nil {
|
|
| 109 |
+ return x.IoUid |
|
| 110 |
+ } |
|
| 111 |
+ return 0 |
|
| 112 |
+} |
|
| 113 |
+ |
|
| 114 |
+func (x *Options) GetIoGid() uint32 {
|
|
| 115 |
+ if x != nil {
|
|
| 116 |
+ return x.IoGid |
|
| 117 |
+ } |
|
| 118 |
+ return 0 |
|
| 119 |
+} |
|
| 120 |
+ |
|
| 121 |
+func (x *Options) GetBinaryName() string {
|
|
| 122 |
+ if x != nil {
|
|
| 123 |
+ return x.BinaryName |
|
| 124 |
+ } |
|
| 125 |
+ return "" |
|
| 126 |
+} |
|
| 127 |
+ |
|
| 128 |
+func (x *Options) GetRoot() string {
|
|
| 129 |
+ if x != nil {
|
|
| 130 |
+ return x.Root |
|
| 131 |
+ } |
|
| 132 |
+ return "" |
|
| 133 |
+} |
|
| 134 |
+ |
|
| 135 |
+func (x *Options) GetSystemdCgroup() bool {
|
|
| 136 |
+ if x != nil {
|
|
| 137 |
+ return x.SystemdCgroup |
|
| 138 |
+ } |
|
| 139 |
+ return false |
|
| 140 |
+} |
|
| 141 |
+ |
|
| 142 |
+func (x *Options) GetCriuImagePath() string {
|
|
| 143 |
+ if x != nil {
|
|
| 144 |
+ return x.CriuImagePath |
|
| 145 |
+ } |
|
| 146 |
+ return "" |
|
| 147 |
+} |
|
| 148 |
+ |
|
| 149 |
+func (x *Options) GetCriuWorkPath() string {
|
|
| 150 |
+ if x != nil {
|
|
| 151 |
+ return x.CriuWorkPath |
|
| 152 |
+ } |
|
| 153 |
+ return "" |
|
| 154 |
+} |
|
| 155 |
+ |
|
| 156 |
+func (x *Options) GetTaskApiAddress() string {
|
|
| 157 |
+ if x != nil {
|
|
| 158 |
+ return x.TaskApiAddress |
|
| 159 |
+ } |
|
| 160 |
+ return "" |
|
| 161 |
+} |
|
| 162 |
+ |
|
| 163 |
+func (x *Options) GetTaskApiVersion() uint32 {
|
|
| 164 |
+ if x != nil {
|
|
| 165 |
+ return x.TaskApiVersion |
|
| 166 |
+ } |
|
| 167 |
+ return 0 |
|
| 168 |
+} |
|
| 169 |
+ |
|
| 170 |
+type CheckpointOptions struct {
|
|
| 171 |
+ state protoimpl.MessageState |
|
| 172 |
+ sizeCache protoimpl.SizeCache |
|
| 173 |
+ unknownFields protoimpl.UnknownFields |
|
| 174 |
+ |
|
| 175 |
+ // exit the container after a checkpoint |
|
| 176 |
+ Exit bool `protobuf:"varint,1,opt,name=exit,proto3" json:"exit,omitempty"` |
|
| 177 |
+ // checkpoint open tcp connections |
|
| 178 |
+ OpenTcp bool `protobuf:"varint,2,opt,name=open_tcp,json=openTcp,proto3" json:"open_tcp,omitempty"` |
|
| 179 |
+ // checkpoint external unix sockets |
|
| 180 |
+ ExternalUnixSockets bool `protobuf:"varint,3,opt,name=external_unix_sockets,json=externalUnixSockets,proto3" json:"external_unix_sockets,omitempty"` |
|
| 181 |
+ // checkpoint terminals (ptys) |
|
| 182 |
+ Terminal bool `protobuf:"varint,4,opt,name=terminal,proto3" json:"terminal,omitempty"` |
|
| 183 |
+ // allow checkpointing of file locks |
|
| 184 |
+ FileLocks bool `protobuf:"varint,5,opt,name=file_locks,json=fileLocks,proto3" json:"file_locks,omitempty"` |
|
| 185 |
+ // restore provided namespaces as empty namespaces |
|
| 186 |
+ EmptyNamespaces []string `protobuf:"bytes,6,rep,name=empty_namespaces,json=emptyNamespaces,proto3" json:"empty_namespaces,omitempty"` |
|
| 187 |
+ // set the cgroups mode, soft, full, strict |
|
| 188 |
+ CgroupsMode string `protobuf:"bytes,7,opt,name=cgroups_mode,json=cgroupsMode,proto3" json:"cgroups_mode,omitempty"` |
|
| 189 |
+ // checkpoint image path |
|
| 190 |
+ ImagePath string `protobuf:"bytes,8,opt,name=image_path,json=imagePath,proto3" json:"image_path,omitempty"` |
|
| 191 |
+ // checkpoint work path |
|
| 192 |
+ WorkPath string `protobuf:"bytes,9,opt,name=work_path,json=workPath,proto3" json:"work_path,omitempty"` |
|
| 193 |
+} |
|
| 194 |
+ |
|
| 195 |
+func (x *CheckpointOptions) Reset() {
|
|
| 196 |
+ *x = CheckpointOptions{}
|
|
| 197 |
+ if protoimpl.UnsafeEnabled {
|
|
| 198 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[1] |
|
| 199 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 200 |
+ ms.StoreMessageInfo(mi) |
|
| 201 |
+ } |
|
| 202 |
+} |
|
| 203 |
+ |
|
| 204 |
+func (x *CheckpointOptions) String() string {
|
|
| 205 |
+ return protoimpl.X.MessageStringOf(x) |
|
| 206 |
+} |
|
| 207 |
+ |
|
| 208 |
+func (*CheckpointOptions) ProtoMessage() {}
|
|
| 209 |
+ |
|
| 210 |
+func (x *CheckpointOptions) ProtoReflect() protoreflect.Message {
|
|
| 211 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[1] |
|
| 212 |
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
| 213 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 214 |
+ if ms.LoadMessageInfo() == nil {
|
|
| 215 |
+ ms.StoreMessageInfo(mi) |
|
| 216 |
+ } |
|
| 217 |
+ return ms |
|
| 218 |
+ } |
|
| 219 |
+ return mi.MessageOf(x) |
|
| 220 |
+} |
|
| 221 |
+ |
|
| 222 |
+// Deprecated: Use CheckpointOptions.ProtoReflect.Descriptor instead. |
|
| 223 |
+func (*CheckpointOptions) Descriptor() ([]byte, []int) {
|
|
| 224 |
+ return file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescGZIP(), []int{1}
|
|
| 225 |
+} |
|
| 226 |
+ |
|
| 227 |
+func (x *CheckpointOptions) GetExit() bool {
|
|
| 228 |
+ if x != nil {
|
|
| 229 |
+ return x.Exit |
|
| 230 |
+ } |
|
| 231 |
+ return false |
|
| 232 |
+} |
|
| 233 |
+ |
|
| 234 |
+func (x *CheckpointOptions) GetOpenTcp() bool {
|
|
| 235 |
+ if x != nil {
|
|
| 236 |
+ return x.OpenTcp |
|
| 237 |
+ } |
|
| 238 |
+ return false |
|
| 239 |
+} |
|
| 240 |
+ |
|
| 241 |
+func (x *CheckpointOptions) GetExternalUnixSockets() bool {
|
|
| 242 |
+ if x != nil {
|
|
| 243 |
+ return x.ExternalUnixSockets |
|
| 244 |
+ } |
|
| 245 |
+ return false |
|
| 246 |
+} |
|
| 247 |
+ |
|
| 248 |
+func (x *CheckpointOptions) GetTerminal() bool {
|
|
| 249 |
+ if x != nil {
|
|
| 250 |
+ return x.Terminal |
|
| 251 |
+ } |
|
| 252 |
+ return false |
|
| 253 |
+} |
|
| 254 |
+ |
|
| 255 |
+func (x *CheckpointOptions) GetFileLocks() bool {
|
|
| 256 |
+ if x != nil {
|
|
| 257 |
+ return x.FileLocks |
|
| 258 |
+ } |
|
| 259 |
+ return false |
|
| 260 |
+} |
|
| 261 |
+ |
|
| 262 |
+func (x *CheckpointOptions) GetEmptyNamespaces() []string {
|
|
| 263 |
+ if x != nil {
|
|
| 264 |
+ return x.EmptyNamespaces |
|
| 265 |
+ } |
|
| 266 |
+ return nil |
|
| 267 |
+} |
|
| 268 |
+ |
|
| 269 |
+func (x *CheckpointOptions) GetCgroupsMode() string {
|
|
| 270 |
+ if x != nil {
|
|
| 271 |
+ return x.CgroupsMode |
|
| 272 |
+ } |
|
| 273 |
+ return "" |
|
| 274 |
+} |
|
| 275 |
+ |
|
| 276 |
+func (x *CheckpointOptions) GetImagePath() string {
|
|
| 277 |
+ if x != nil {
|
|
| 278 |
+ return x.ImagePath |
|
| 279 |
+ } |
|
| 280 |
+ return "" |
|
| 281 |
+} |
|
| 282 |
+ |
|
| 283 |
+func (x *CheckpointOptions) GetWorkPath() string {
|
|
| 284 |
+ if x != nil {
|
|
| 285 |
+ return x.WorkPath |
|
| 286 |
+ } |
|
| 287 |
+ return "" |
|
| 288 |
+} |
|
| 289 |
+ |
|
| 290 |
+type ProcessDetails struct {
|
|
| 291 |
+ state protoimpl.MessageState |
|
| 292 |
+ sizeCache protoimpl.SizeCache |
|
| 293 |
+ unknownFields protoimpl.UnknownFields |
|
| 294 |
+ |
|
| 295 |
+ // exec process id if the process is managed by a shim |
|
| 296 |
+ ExecID string `protobuf:"bytes,1,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"` |
|
| 297 |
+} |
|
| 298 |
+ |
|
| 299 |
+func (x *ProcessDetails) Reset() {
|
|
| 300 |
+ *x = ProcessDetails{}
|
|
| 301 |
+ if protoimpl.UnsafeEnabled {
|
|
| 302 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[2] |
|
| 303 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 304 |
+ ms.StoreMessageInfo(mi) |
|
| 305 |
+ } |
|
| 306 |
+} |
|
| 307 |
+ |
|
| 308 |
+func (x *ProcessDetails) String() string {
|
|
| 309 |
+ return protoimpl.X.MessageStringOf(x) |
|
| 310 |
+} |
|
| 311 |
+ |
|
| 312 |
+func (*ProcessDetails) ProtoMessage() {}
|
|
| 313 |
+ |
|
| 314 |
+func (x *ProcessDetails) ProtoReflect() protoreflect.Message {
|
|
| 315 |
+ mi := &file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[2] |
|
| 316 |
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
| 317 |
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 318 |
+ if ms.LoadMessageInfo() == nil {
|
|
| 319 |
+ ms.StoreMessageInfo(mi) |
|
| 320 |
+ } |
|
| 321 |
+ return ms |
|
| 322 |
+ } |
|
| 323 |
+ return mi.MessageOf(x) |
|
| 324 |
+} |
|
| 325 |
+ |
|
| 326 |
+// Deprecated: Use ProcessDetails.ProtoReflect.Descriptor instead. |
|
| 327 |
+func (*ProcessDetails) Descriptor() ([]byte, []int) {
|
|
| 328 |
+ return file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescGZIP(), []int{2}
|
|
| 329 |
+} |
|
| 330 |
+ |
|
| 331 |
+func (x *ProcessDetails) GetExecID() string {
|
|
| 332 |
+ if x != nil {
|
|
| 333 |
+ return x.ExecID |
|
| 334 |
+ } |
|
| 335 |
+ return "" |
|
| 336 |
+} |
|
| 337 |
+ |
|
| 338 |
+var File_github_com_containerd_containerd_api_types_runc_options_oci_proto protoreflect.FileDescriptor |
|
| 339 |
+ |
|
| 340 |
+var file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDesc = []byte{
|
|
| 341 |
+ 0x0a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, |
|
| 342 |
+ 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, |
|
| 343 |
+ 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x72, 0x75, 0x6e, |
|
| 344 |
+ 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6f, 0x63, 0x69, 0x2e, 0x70, 0x72, |
|
| 345 |
+ 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, |
|
| 346 |
+ 0x72, 0x75, 0x6e, 0x63, 0x2e, 0x76, 0x31, 0x22, 0xa6, 0x03, 0x0a, 0x07, 0x4f, 0x70, 0x74, 0x69, |
|
| 347 |
+ 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x6e, 0x6f, 0x5f, 0x70, 0x69, 0x76, 0x6f, 0x74, 0x5f, |
|
| 348 |
+ 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x6e, 0x6f, 0x50, 0x69, |
|
| 349 |
+ 0x76, 0x6f, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x6f, 0x5f, 0x6e, 0x65, |
|
| 350 |
+ 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, |
|
| 351 |
+ 0x0c, 0x6e, 0x6f, 0x4e, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1f, 0x0a, |
|
| 352 |
+ 0x0b, 0x73, 0x68, 0x69, 0x6d, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, |
|
| 353 |
+ 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x69, 0x6d, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x15, |
|
| 354 |
+ 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, |
|
| 355 |
+ 0x69, 0x6f, 0x55, 0x69, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x67, 0x69, 0x64, 0x18, |
|
| 356 |
+ 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6f, 0x47, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, |
|
| 357 |
+ 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, |
|
| 358 |
+ 0x09, 0x52, 0x0a, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, |
|
| 359 |
+ 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, |
|
| 360 |
+ 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x64, 0x5f, 0x63, 0x67, 0x72, |
|
| 361 |
+ 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x79, 0x73, 0x74, 0x65, |
|
| 362 |
+ 0x6d, 0x64, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x72, 0x69, 0x75, |
|
| 363 |
+ 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, |
|
| 364 |
+ 0x09, 0x52, 0x0d, 0x63, 0x72, 0x69, 0x75, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x74, 0x68, |
|
| 365 |
+ 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x61, |
|
| 366 |
+ 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x69, 0x75, 0x57, 0x6f, |
|
| 367 |
+ 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, |
|
| 368 |
+ 0x70, 0x69, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, |
|
| 369 |
+ 0x52, 0x0e, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x69, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, |
|
| 370 |
+ 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x65, 0x72, |
|
| 371 |
+ 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x74, 0x61, 0x73, 0x6b, |
|
| 372 |
+ 0x41, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, |
|
| 373 |
+ 0x22, 0xbb, 0x02, 0x0a, 0x11, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4f, |
|
| 374 |
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x65, 0x78, 0x69, 0x74, 0x18, 0x01, |
|
| 375 |
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x65, 0x78, 0x69, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70, |
|
| 376 |
+ 0x65, 0x6e, 0x5f, 0x74, 0x63, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70, |
|
| 377 |
+ 0x65, 0x6e, 0x54, 0x63, 0x70, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, |
|
| 378 |
+ 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x03, |
|
| 379 |
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x55, 0x6e, |
|
| 380 |
+ 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, |
|
| 381 |
+ 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, |
|
| 382 |
+ 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6c, 0x6f, |
|
| 383 |
+ 0x63, 0x6b, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x4c, |
|
| 384 |
+ 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x6e, 0x61, |
|
| 385 |
+ 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, |
|
| 386 |
+ 0x65, 0x6d, 0x70, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12, |
|
| 387 |
+ 0x21, 0x0a, 0x0c, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, |
|
| 388 |
+ 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x4d, 0x6f, |
|
| 389 |
+ 0x64, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, |
|
| 390 |
+ 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x74, |
|
| 391 |
+ 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x09, |
|
| 392 |
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0x29, |
|
| 393 |
+ 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, |
|
| 394 |
+ 0x12, 0x17, 0x0a, 0x07, 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, |
|
| 395 |
+ 0x09, 0x52, 0x06, 0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, |
|
| 396 |
+ 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, |
|
| 397 |
+ 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, |
|
| 398 |
+ 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, |
|
| 399 |
+ 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, |
|
| 400 |
+ 0x6f, 0x74, 0x6f, 0x33, |
|
| 401 |
+} |
|
| 402 |
+ |
|
| 403 |
+var ( |
|
| 404 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescOnce sync.Once |
|
| 405 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescData = file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDesc |
|
| 406 |
+) |
|
| 407 |
+ |
|
| 408 |
+func file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescGZIP() []byte {
|
|
| 409 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescOnce.Do(func() {
|
|
| 410 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescData) |
|
| 411 |
+ }) |
|
| 412 |
+ return file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDescData |
|
| 413 |
+} |
|
| 414 |
+ |
|
| 415 |
+var file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes = make([]protoimpl.MessageInfo, 3) |
|
| 416 |
+var file_github_com_containerd_containerd_api_types_runc_options_oci_proto_goTypes = []interface{}{
|
|
| 417 |
+ (*Options)(nil), // 0: containerd.runc.v1.Options |
|
| 418 |
+ (*CheckpointOptions)(nil), // 1: containerd.runc.v1.CheckpointOptions |
|
| 419 |
+ (*ProcessDetails)(nil), // 2: containerd.runc.v1.ProcessDetails |
|
| 420 |
+} |
|
| 421 |
+var file_github_com_containerd_containerd_api_types_runc_options_oci_proto_depIdxs = []int32{
|
|
| 422 |
+ 0, // [0:0] is the sub-list for method output_type |
|
| 423 |
+ 0, // [0:0] is the sub-list for method input_type |
|
| 424 |
+ 0, // [0:0] is the sub-list for extension type_name |
|
| 425 |
+ 0, // [0:0] is the sub-list for extension extendee |
|
| 426 |
+ 0, // [0:0] is the sub-list for field type_name |
|
| 427 |
+} |
|
| 428 |
+ |
|
| 429 |
+func init() { file_github_com_containerd_containerd_api_types_runc_options_oci_proto_init() }
|
|
| 430 |
+func file_github_com_containerd_containerd_api_types_runc_options_oci_proto_init() {
|
|
| 431 |
+ if File_github_com_containerd_containerd_api_types_runc_options_oci_proto != nil {
|
|
| 432 |
+ return |
|
| 433 |
+ } |
|
| 434 |
+ if !protoimpl.UnsafeEnabled {
|
|
| 435 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
|
| 436 |
+ switch v := v.(*Options); i {
|
|
| 437 |
+ case 0: |
|
| 438 |
+ return &v.state |
|
| 439 |
+ case 1: |
|
| 440 |
+ return &v.sizeCache |
|
| 441 |
+ case 2: |
|
| 442 |
+ return &v.unknownFields |
|
| 443 |
+ default: |
|
| 444 |
+ return nil |
|
| 445 |
+ } |
|
| 446 |
+ } |
|
| 447 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
|
| 448 |
+ switch v := v.(*CheckpointOptions); i {
|
|
| 449 |
+ case 0: |
|
| 450 |
+ return &v.state |
|
| 451 |
+ case 1: |
|
| 452 |
+ return &v.sizeCache |
|
| 453 |
+ case 2: |
|
| 454 |
+ return &v.unknownFields |
|
| 455 |
+ default: |
|
| 456 |
+ return nil |
|
| 457 |
+ } |
|
| 458 |
+ } |
|
| 459 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
|
| 460 |
+ switch v := v.(*ProcessDetails); i {
|
|
| 461 |
+ case 0: |
|
| 462 |
+ return &v.state |
|
| 463 |
+ case 1: |
|
| 464 |
+ return &v.sizeCache |
|
| 465 |
+ case 2: |
|
| 466 |
+ return &v.unknownFields |
|
| 467 |
+ default: |
|
| 468 |
+ return nil |
|
| 469 |
+ } |
|
| 470 |
+ } |
|
| 471 |
+ } |
|
| 472 |
+ type x struct{}
|
|
| 473 |
+ out := protoimpl.TypeBuilder{
|
|
| 474 |
+ File: protoimpl.DescBuilder{
|
|
| 475 |
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
|
| 476 |
+ RawDescriptor: file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDesc, |
|
| 477 |
+ NumEnums: 0, |
|
| 478 |
+ NumMessages: 3, |
|
| 479 |
+ NumExtensions: 0, |
|
| 480 |
+ NumServices: 0, |
|
| 481 |
+ }, |
|
| 482 |
+ GoTypes: file_github_com_containerd_containerd_api_types_runc_options_oci_proto_goTypes, |
|
| 483 |
+ DependencyIndexes: file_github_com_containerd_containerd_api_types_runc_options_oci_proto_depIdxs, |
|
| 484 |
+ MessageInfos: file_github_com_containerd_containerd_api_types_runc_options_oci_proto_msgTypes, |
|
| 485 |
+ }.Build() |
|
| 486 |
+ File_github_com_containerd_containerd_api_types_runc_options_oci_proto = out.File |
|
| 487 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_rawDesc = nil |
|
| 488 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_goTypes = nil |
|
| 489 |
+ file_github_com_containerd_containerd_api_types_runc_options_oci_proto_depIdxs = nil |
|
| 490 |
+} |
| 0 | 491 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,63 @@ |
| 0 |
+syntax = "proto3"; |
|
| 1 |
+ |
|
| 2 |
+package containerd.runc.v1; |
|
| 3 |
+ |
|
| 4 |
+option go_package = "github.com/containerd/containerd/api/types/runc/options;options"; |
|
| 5 |
+ |
|
| 6 |
+message Options {
|
|
| 7 |
+ // disable pivot root when creating a container |
|
| 8 |
+ bool no_pivot_root = 1; |
|
| 9 |
+ // create a new keyring for the container |
|
| 10 |
+ bool no_new_keyring = 2; |
|
| 11 |
+ // place the shim in a cgroup |
|
| 12 |
+ string shim_cgroup = 3; |
|
| 13 |
+ // set the I/O's pipes uid |
|
| 14 |
+ uint32 io_uid = 4; |
|
| 15 |
+ // set the I/O's pipes gid |
|
| 16 |
+ uint32 io_gid = 5; |
|
| 17 |
+ // binary name of the runc binary |
|
| 18 |
+ string binary_name = 6; |
|
| 19 |
+ // runc root directory |
|
| 20 |
+ string root = 7; |
|
| 21 |
+ // criu binary path. |
|
| 22 |
+ // |
|
| 23 |
+ // Removed in containerd v2.0: string criu_path = 8; |
|
| 24 |
+ reserved 8; |
|
| 25 |
+ // enable systemd cgroups |
|
| 26 |
+ bool systemd_cgroup = 9; |
|
| 27 |
+ // criu image path |
|
| 28 |
+ string criu_image_path = 10; |
|
| 29 |
+ // criu work path |
|
| 30 |
+ string criu_work_path = 11; |
|
| 31 |
+ // task api address, can be a unix domain socket, or vsock address. |
|
| 32 |
+ // it is in the form of ttrpc+unix://path/to/uds or grpc+vsock://<vsock cid>:<port>. |
|
| 33 |
+ string task_api_address = 12; |
|
| 34 |
+ // task api version, currently supported value is 2 and 3. |
|
| 35 |
+ uint32 task_api_version = 13; |
|
| 36 |
+} |
|
| 37 |
+ |
|
| 38 |
+message CheckpointOptions {
|
|
| 39 |
+ // exit the container after a checkpoint |
|
| 40 |
+ bool exit = 1; |
|
| 41 |
+ // checkpoint open tcp connections |
|
| 42 |
+ bool open_tcp = 2; |
|
| 43 |
+ // checkpoint external unix sockets |
|
| 44 |
+ bool external_unix_sockets = 3; |
|
| 45 |
+ // checkpoint terminals (ptys) |
|
| 46 |
+ bool terminal = 4; |
|
| 47 |
+ // allow checkpointing of file locks |
|
| 48 |
+ bool file_locks = 5; |
|
| 49 |
+ // restore provided namespaces as empty namespaces |
|
| 50 |
+ repeated string empty_namespaces = 6; |
|
| 51 |
+ // set the cgroups mode, soft, full, strict |
|
| 52 |
+ string cgroups_mode = 7; |
|
| 53 |
+ // checkpoint image path |
|
| 54 |
+ string image_path = 8; |
|
| 55 |
+ // checkpoint work path |
|
| 56 |
+ string work_path = 9; |
|
| 57 |
+} |
|
| 58 |
+ |
|
| 59 |
+message ProcessDetails {
|
|
| 60 |
+ // exec process id if the process is managed by a shim |
|
| 61 |
+ string exec_id = 1; |
|
| 62 |
+} |
| ... | ... |
@@ -343,7 +343,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header |
| 343 | 343 |
} |
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 |
- //nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA |
|
| 346 |
+ //nolint:staticcheck // Ignore SA1019. TypeRegA is deprecated but we may still receive an external tar with TypeRegA |
|
| 347 | 347 |
case tar.TypeReg, tar.TypeRegA: |
| 348 | 348 |
file, err := openFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, hdrInfo.Mode()) |
| 349 | 349 |
if err != nil {
|
| ... | ... |
@@ -26,6 +26,7 @@ import ( |
| 26 | 26 |
|
| 27 | 27 |
"github.com/containerd/containerd/api/services/tasks/v1" |
| 28 | 28 |
"github.com/containerd/containerd/api/types" |
| 29 |
+ "github.com/containerd/containerd/api/types/runc/options" |
|
| 29 | 30 |
tasktypes "github.com/containerd/containerd/api/types/task" |
| 30 | 31 |
"github.com/containerd/containerd/cio" |
| 31 | 32 |
"github.com/containerd/containerd/containers" |
| ... | ... |
@@ -33,7 +34,6 @@ import ( |
| 33 | 33 |
"github.com/containerd/containerd/images" |
| 34 | 34 |
"github.com/containerd/containerd/oci" |
| 35 | 35 |
"github.com/containerd/containerd/protobuf" |
| 36 |
- "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 37 | 36 |
"github.com/containerd/fifo" |
| 38 | 37 |
"github.com/containerd/typeurl/v2" |
| 39 | 38 |
ver "github.com/opencontainers/image-spec/specs-go" |
| ... | ... |
@@ -24,13 +24,13 @@ import ( |
| 24 | 24 |
"runtime" |
| 25 | 25 |
|
| 26 | 26 |
tasks "github.com/containerd/containerd/api/services/tasks/v1" |
| 27 |
+ "github.com/containerd/containerd/api/types/runc/options" |
|
| 27 | 28 |
"github.com/containerd/containerd/containers" |
| 28 | 29 |
"github.com/containerd/containerd/diff" |
| 29 | 30 |
"github.com/containerd/containerd/images" |
| 30 | 31 |
"github.com/containerd/containerd/protobuf" |
| 31 | 32 |
"github.com/containerd/containerd/protobuf/proto" |
| 32 | 33 |
"github.com/containerd/containerd/rootfs" |
| 33 |
- "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 34 | 34 |
"github.com/containerd/platforms" |
| 35 | 35 |
"github.com/opencontainers/go-digest" |
| 36 | 36 |
imagespec "github.com/opencontainers/image-spec/specs-go/v1" |
| ... | ... |
@@ -45,21 +45,21 @@ func ToGRPC(err error) error {
|
| 45 | 45 |
|
| 46 | 46 |
switch {
|
| 47 | 47 |
case IsInvalidArgument(err): |
| 48 |
- return status.Errorf(codes.InvalidArgument, err.Error()) |
|
| 48 |
+ return status.Error(codes.InvalidArgument, err.Error()) |
|
| 49 | 49 |
case IsNotFound(err): |
| 50 |
- return status.Errorf(codes.NotFound, err.Error()) |
|
| 50 |
+ return status.Error(codes.NotFound, err.Error()) |
|
| 51 | 51 |
case IsAlreadyExists(err): |
| 52 |
- return status.Errorf(codes.AlreadyExists, err.Error()) |
|
| 52 |
+ return status.Error(codes.AlreadyExists, err.Error()) |
|
| 53 | 53 |
case IsFailedPrecondition(err): |
| 54 |
- return status.Errorf(codes.FailedPrecondition, err.Error()) |
|
| 54 |
+ return status.Error(codes.FailedPrecondition, err.Error()) |
|
| 55 | 55 |
case IsUnavailable(err): |
| 56 |
- return status.Errorf(codes.Unavailable, err.Error()) |
|
| 56 |
+ return status.Error(codes.Unavailable, err.Error()) |
|
| 57 | 57 |
case IsNotImplemented(err): |
| 58 |
- return status.Errorf(codes.Unimplemented, err.Error()) |
|
| 58 |
+ return status.Error(codes.Unimplemented, err.Error()) |
|
| 59 | 59 |
case IsCanceled(err): |
| 60 |
- return status.Errorf(codes.Canceled, err.Error()) |
|
| 60 |
+ return status.Error(codes.Canceled, err.Error()) |
|
| 61 | 61 |
case IsDeadlineExceeded(err): |
| 62 |
- return status.Errorf(codes.DeadlineExceeded, err.Error()) |
|
| 62 |
+ return status.Error(codes.DeadlineExceeded, err.Error()) |
|
| 63 | 63 |
} |
| 64 | 64 |
|
| 65 | 65 |
return err |
| ... | ... |
@@ -22,6 +22,7 @@ import ( |
| 22 | 22 |
"github.com/containerd/typeurl/v2" |
| 23 | 23 |
|
| 24 | 24 |
eventsapi "github.com/containerd/containerd/api/services/events/v1" |
| 25 |
+ "github.com/containerd/containerd/api/types" |
|
| 25 | 26 |
"github.com/containerd/containerd/errdefs" |
| 26 | 27 |
"github.com/containerd/containerd/events" |
| 27 | 28 |
"github.com/containerd/containerd/protobuf" |
| ... | ... |
@@ -63,7 +64,7 @@ func (e *eventRemote) Publish(ctx context.Context, topic string, event events.Ev |
| 63 | 63 |
|
| 64 | 64 |
func (e *eventRemote) Forward(ctx context.Context, envelope *events.Envelope) error {
|
| 65 | 65 |
req := &eventsapi.ForwardRequest{
|
| 66 |
- Envelope: &eventsapi.Envelope{
|
|
| 66 |
+ Envelope: &types.Envelope{
|
|
| 67 | 67 |
Timestamp: protobuf.ToTimestamp(envelope.Timestamp), |
| 68 | 68 |
Namespace: envelope.Namespace, |
| 69 | 69 |
Topic: envelope.Topic, |
| ... | ... |
@@ -121,7 +121,7 @@ loop: |
| 121 | 121 |
case tokenEOF: |
| 122 | 122 |
break loop |
| 123 | 123 |
default: |
| 124 |
- return nil, p.mkerr(p.scanner.ppos, "unexpected input: %v", string(tok)) |
|
| 124 |
+ return nil, p.mkerrf(p.scanner.ppos, "unexpected input: %v", string(tok)) |
|
| 125 | 125 |
} |
| 126 | 126 |
} |
| 127 | 127 |
|
| ... | ... |
@@ -226,7 +226,7 @@ func (p *parser) operator() (operator, error) {
|
| 226 | 226 |
case "~=": |
| 227 | 227 |
return operatorMatches, nil |
| 228 | 228 |
default: |
| 229 |
- return 0, p.mkerr(pos, "unsupported operator %q", s) |
|
| 229 |
+ return 0, p.mkerrf(pos, "unsupported operator %q", s) |
|
| 230 | 230 |
} |
| 231 | 231 |
case tokenIllegal: |
| 232 | 232 |
return 0, p.mkerr(pos, p.scanner.err) |
| ... | ... |
@@ -257,7 +257,7 @@ func (p *parser) unquote(pos int, s string, allowAlts bool) (string, error) {
|
| 257 | 257 |
|
| 258 | 258 |
uq, err := unquote(s) |
| 259 | 259 |
if err != nil {
|
| 260 |
- return "", p.mkerr(pos, "unquoting failed: %v", err) |
|
| 260 |
+ return "", p.mkerrf(pos, "unquoting failed: %v", err) |
|
| 261 | 261 |
} |
| 262 | 262 |
|
| 263 | 263 |
return uq, nil |
| ... | ... |
@@ -281,10 +281,14 @@ func (pe parseError) Error() string {
|
| 281 | 281 |
return fmt.Sprintf("[%s]: %v", pe.input, pe.msg)
|
| 282 | 282 |
} |
| 283 | 283 |
|
| 284 |
-func (p *parser) mkerr(pos int, format string, args ...interface{}) error {
|
|
| 284 |
+func (p *parser) mkerrf(pos int, format string, args ...interface{}) error {
|
|
| 285 |
+ return p.mkerr(pos, fmt.Sprintf(format, args...)) |
|
| 286 |
+} |
|
| 287 |
+ |
|
| 288 |
+func (p *parser) mkerr(pos int, msg string) error {
|
|
| 285 | 289 |
return fmt.Errorf("parse error: %w", parseError{
|
| 286 | 290 |
input: p.input, |
| 287 | 291 |
pos: pos, |
| 288 |
- msg: fmt.Sprintf(format, args...), |
|
| 292 |
+ msg: msg, |
|
| 289 | 293 |
}) |
| 290 | 294 |
} |
| 5 | 5 |
deleted file mode 100644 |
| ... | ... |
@@ -1,17 +0,0 @@ |
| 1 |
-/* |
|
| 2 |
- Copyright The containerd Authors. |
|
| 3 |
- |
|
| 4 |
- Licensed under the Apache License, Version 2.0 (the "License"); |
|
| 5 |
- you may not use this file except in compliance with the License. |
|
| 6 |
- You may obtain a copy of the License at |
|
| 7 |
- |
|
| 8 |
- http://www.apache.org/licenses/LICENSE-2.0 |
|
| 9 |
- |
|
| 10 |
- Unless required by applicable law or agreed to in writing, software |
|
| 11 |
- distributed under the License is distributed on an "AS IS" BASIS, |
|
| 12 |
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
| 13 |
- See the License for the specific language governing permissions and |
|
| 14 |
- limitations under the License. |
|
| 15 |
-*/ |
|
| 16 |
- |
|
| 17 |
-package options |
| 18 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,167 +0,0 @@ |
| 1 |
-file {
|
|
| 2 |
- name: "github.com/containerd/containerd/runtime/v2/runc/options/oci.proto" |
|
| 3 |
- package: "containerd.runc.v1" |
|
| 4 |
- message_type {
|
|
| 5 |
- name: "Options" |
|
| 6 |
- field {
|
|
| 7 |
- name: "no_pivot_root" |
|
| 8 |
- number: 1 |
|
| 9 |
- label: LABEL_OPTIONAL |
|
| 10 |
- type: TYPE_BOOL |
|
| 11 |
- json_name: "noPivotRoot" |
|
| 12 |
- } |
|
| 13 |
- field {
|
|
| 14 |
- name: "no_new_keyring" |
|
| 15 |
- number: 2 |
|
| 16 |
- label: LABEL_OPTIONAL |
|
| 17 |
- type: TYPE_BOOL |
|
| 18 |
- json_name: "noNewKeyring" |
|
| 19 |
- } |
|
| 20 |
- field {
|
|
| 21 |
- name: "shim_cgroup" |
|
| 22 |
- number: 3 |
|
| 23 |
- label: LABEL_OPTIONAL |
|
| 24 |
- type: TYPE_STRING |
|
| 25 |
- json_name: "shimCgroup" |
|
| 26 |
- } |
|
| 27 |
- field {
|
|
| 28 |
- name: "io_uid" |
|
| 29 |
- number: 4 |
|
| 30 |
- label: LABEL_OPTIONAL |
|
| 31 |
- type: TYPE_UINT32 |
|
| 32 |
- json_name: "ioUid" |
|
| 33 |
- } |
|
| 34 |
- field {
|
|
| 35 |
- name: "io_gid" |
|
| 36 |
- number: 5 |
|
| 37 |
- label: LABEL_OPTIONAL |
|
| 38 |
- type: TYPE_UINT32 |
|
| 39 |
- json_name: "ioGid" |
|
| 40 |
- } |
|
| 41 |
- field {
|
|
| 42 |
- name: "binary_name" |
|
| 43 |
- number: 6 |
|
| 44 |
- label: LABEL_OPTIONAL |
|
| 45 |
- type: TYPE_STRING |
|
| 46 |
- json_name: "binaryName" |
|
| 47 |
- } |
|
| 48 |
- field {
|
|
| 49 |
- name: "root" |
|
| 50 |
- number: 7 |
|
| 51 |
- label: LABEL_OPTIONAL |
|
| 52 |
- type: TYPE_STRING |
|
| 53 |
- json_name: "root" |
|
| 54 |
- } |
|
| 55 |
- field {
|
|
| 56 |
- name: "criu_path" |
|
| 57 |
- number: 8 |
|
| 58 |
- label: LABEL_OPTIONAL |
|
| 59 |
- type: TYPE_STRING |
|
| 60 |
- options {
|
|
| 61 |
- deprecated: true |
|
| 62 |
- } |
|
| 63 |
- json_name: "criuPath" |
|
| 64 |
- } |
|
| 65 |
- field {
|
|
| 66 |
- name: "systemd_cgroup" |
|
| 67 |
- number: 9 |
|
| 68 |
- label: LABEL_OPTIONAL |
|
| 69 |
- type: TYPE_BOOL |
|
| 70 |
- json_name: "systemdCgroup" |
|
| 71 |
- } |
|
| 72 |
- field {
|
|
| 73 |
- name: "criu_image_path" |
|
| 74 |
- number: 10 |
|
| 75 |
- label: LABEL_OPTIONAL |
|
| 76 |
- type: TYPE_STRING |
|
| 77 |
- json_name: "criuImagePath" |
|
| 78 |
- } |
|
| 79 |
- field {
|
|
| 80 |
- name: "criu_work_path" |
|
| 81 |
- number: 11 |
|
| 82 |
- label: LABEL_OPTIONAL |
|
| 83 |
- type: TYPE_STRING |
|
| 84 |
- json_name: "criuWorkPath" |
|
| 85 |
- } |
|
| 86 |
- } |
|
| 87 |
- message_type {
|
|
| 88 |
- name: "CheckpointOptions" |
|
| 89 |
- field {
|
|
| 90 |
- name: "exit" |
|
| 91 |
- number: 1 |
|
| 92 |
- label: LABEL_OPTIONAL |
|
| 93 |
- type: TYPE_BOOL |
|
| 94 |
- json_name: "exit" |
|
| 95 |
- } |
|
| 96 |
- field {
|
|
| 97 |
- name: "open_tcp" |
|
| 98 |
- number: 2 |
|
| 99 |
- label: LABEL_OPTIONAL |
|
| 100 |
- type: TYPE_BOOL |
|
| 101 |
- json_name: "openTcp" |
|
| 102 |
- } |
|
| 103 |
- field {
|
|
| 104 |
- name: "external_unix_sockets" |
|
| 105 |
- number: 3 |
|
| 106 |
- label: LABEL_OPTIONAL |
|
| 107 |
- type: TYPE_BOOL |
|
| 108 |
- json_name: "externalUnixSockets" |
|
| 109 |
- } |
|
| 110 |
- field {
|
|
| 111 |
- name: "terminal" |
|
| 112 |
- number: 4 |
|
| 113 |
- label: LABEL_OPTIONAL |
|
| 114 |
- type: TYPE_BOOL |
|
| 115 |
- json_name: "terminal" |
|
| 116 |
- } |
|
| 117 |
- field {
|
|
| 118 |
- name: "file_locks" |
|
| 119 |
- number: 5 |
|
| 120 |
- label: LABEL_OPTIONAL |
|
| 121 |
- type: TYPE_BOOL |
|
| 122 |
- json_name: "fileLocks" |
|
| 123 |
- } |
|
| 124 |
- field {
|
|
| 125 |
- name: "empty_namespaces" |
|
| 126 |
- number: 6 |
|
| 127 |
- label: LABEL_REPEATED |
|
| 128 |
- type: TYPE_STRING |
|
| 129 |
- json_name: "emptyNamespaces" |
|
| 130 |
- } |
|
| 131 |
- field {
|
|
| 132 |
- name: "cgroups_mode" |
|
| 133 |
- number: 7 |
|
| 134 |
- label: LABEL_OPTIONAL |
|
| 135 |
- type: TYPE_STRING |
|
| 136 |
- json_name: "cgroupsMode" |
|
| 137 |
- } |
|
| 138 |
- field {
|
|
| 139 |
- name: "image_path" |
|
| 140 |
- number: 8 |
|
| 141 |
- label: LABEL_OPTIONAL |
|
| 142 |
- type: TYPE_STRING |
|
| 143 |
- json_name: "imagePath" |
|
| 144 |
- } |
|
| 145 |
- field {
|
|
| 146 |
- name: "work_path" |
|
| 147 |
- number: 9 |
|
| 148 |
- label: LABEL_OPTIONAL |
|
| 149 |
- type: TYPE_STRING |
|
| 150 |
- json_name: "workPath" |
|
| 151 |
- } |
|
| 152 |
- } |
|
| 153 |
- message_type {
|
|
| 154 |
- name: "ProcessDetails" |
|
| 155 |
- field {
|
|
| 156 |
- name: "exec_id" |
|
| 157 |
- number: 1 |
|
| 158 |
- label: LABEL_OPTIONAL |
|
| 159 |
- type: TYPE_STRING |
|
| 160 |
- json_name: "execId" |
|
| 161 |
- } |
|
| 162 |
- } |
|
| 163 |
- options {
|
|
| 164 |
- go_package: "github.com/containerd/containerd/runtime/v2/runc/options;options" |
|
| 165 |
- } |
|
| 166 |
- syntax: "proto3" |
|
| 167 |
-} |
| 168 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,485 +0,0 @@ |
| 1 |
-// Code generated by protoc-gen-go. DO NOT EDIT. |
|
| 2 |
-// versions: |
|
| 3 |
-// protoc-gen-go v1.28.1 |
|
| 4 |
-// protoc v3.20.1 |
|
| 5 |
-// source: github.com/containerd/containerd/runtime/v2/runc/options/oci.proto |
|
| 6 |
- |
|
| 7 |
-package options |
|
| 8 |
- |
|
| 9 |
-import ( |
|
| 10 |
- protoreflect "google.golang.org/protobuf/reflect/protoreflect" |
|
| 11 |
- protoimpl "google.golang.org/protobuf/runtime/protoimpl" |
|
| 12 |
- reflect "reflect" |
|
| 13 |
- sync "sync" |
|
| 14 |
-) |
|
| 15 |
- |
|
| 16 |
-const ( |
|
| 17 |
- // Verify that this generated code is sufficiently up-to-date. |
|
| 18 |
- _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) |
|
| 19 |
- // Verify that runtime/protoimpl is sufficiently up-to-date. |
|
| 20 |
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) |
|
| 21 |
-) |
|
| 22 |
- |
|
| 23 |
-type Options struct {
|
|
| 24 |
- state protoimpl.MessageState |
|
| 25 |
- sizeCache protoimpl.SizeCache |
|
| 26 |
- unknownFields protoimpl.UnknownFields |
|
| 27 |
- |
|
| 28 |
- // disable pivot root when creating a container |
|
| 29 |
- NoPivotRoot bool `protobuf:"varint,1,opt,name=no_pivot_root,json=noPivotRoot,proto3" json:"no_pivot_root,omitempty"` |
|
| 30 |
- // create a new keyring for the container |
|
| 31 |
- NoNewKeyring bool `protobuf:"varint,2,opt,name=no_new_keyring,json=noNewKeyring,proto3" json:"no_new_keyring,omitempty"` |
|
| 32 |
- // place the shim in a cgroup |
|
| 33 |
- ShimCgroup string `protobuf:"bytes,3,opt,name=shim_cgroup,json=shimCgroup,proto3" json:"shim_cgroup,omitempty"` |
|
| 34 |
- // set the I/O's pipes uid |
|
| 35 |
- IoUid uint32 `protobuf:"varint,4,opt,name=io_uid,json=ioUid,proto3" json:"io_uid,omitempty"` |
|
| 36 |
- // set the I/O's pipes gid |
|
| 37 |
- IoGid uint32 `protobuf:"varint,5,opt,name=io_gid,json=ioGid,proto3" json:"io_gid,omitempty"` |
|
| 38 |
- // binary name of the runc binary |
|
| 39 |
- BinaryName string `protobuf:"bytes,6,opt,name=binary_name,json=binaryName,proto3" json:"binary_name,omitempty"` |
|
| 40 |
- // runc root directory |
|
| 41 |
- Root string `protobuf:"bytes,7,opt,name=root,proto3" json:"root,omitempty"` |
|
| 42 |
- // criu binary path. |
|
| 43 |
- // |
|
| 44 |
- // Deprecated: runc option --criu is now ignored (with a warning), and the |
|
| 45 |
- // option will be removed entirely in a future release. Users who need a non- |
|
| 46 |
- // standard criu binary should rely on the standard way of looking up binaries |
|
| 47 |
- // in $PATH. |
|
| 48 |
- // |
|
| 49 |
- // Deprecated: Do not use. |
|
| 50 |
- CriuPath string `protobuf:"bytes,8,opt,name=criu_path,json=criuPath,proto3" json:"criu_path,omitempty"` |
|
| 51 |
- // enable systemd cgroups |
|
| 52 |
- SystemdCgroup bool `protobuf:"varint,9,opt,name=systemd_cgroup,json=systemdCgroup,proto3" json:"systemd_cgroup,omitempty"` |
|
| 53 |
- // criu image path |
|
| 54 |
- CriuImagePath string `protobuf:"bytes,10,opt,name=criu_image_path,json=criuImagePath,proto3" json:"criu_image_path,omitempty"` |
|
| 55 |
- // criu work path |
|
| 56 |
- CriuWorkPath string `protobuf:"bytes,11,opt,name=criu_work_path,json=criuWorkPath,proto3" json:"criu_work_path,omitempty"` |
|
| 57 |
-} |
|
| 58 |
- |
|
| 59 |
-func (x *Options) Reset() {
|
|
| 60 |
- *x = Options{}
|
|
| 61 |
- if protoimpl.UnsafeEnabled {
|
|
| 62 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0] |
|
| 63 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 64 |
- ms.StoreMessageInfo(mi) |
|
| 65 |
- } |
|
| 66 |
-} |
|
| 67 |
- |
|
| 68 |
-func (x *Options) String() string {
|
|
| 69 |
- return protoimpl.X.MessageStringOf(x) |
|
| 70 |
-} |
|
| 71 |
- |
|
| 72 |
-func (*Options) ProtoMessage() {}
|
|
| 73 |
- |
|
| 74 |
-func (x *Options) ProtoReflect() protoreflect.Message {
|
|
| 75 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0] |
|
| 76 |
- if protoimpl.UnsafeEnabled && x != nil {
|
|
| 77 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 78 |
- if ms.LoadMessageInfo() == nil {
|
|
| 79 |
- ms.StoreMessageInfo(mi) |
|
| 80 |
- } |
|
| 81 |
- return ms |
|
| 82 |
- } |
|
| 83 |
- return mi.MessageOf(x) |
|
| 84 |
-} |
|
| 85 |
- |
|
| 86 |
-// Deprecated: Use Options.ProtoReflect.Descriptor instead. |
|
| 87 |
-func (*Options) Descriptor() ([]byte, []int) {
|
|
| 88 |
- return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{0}
|
|
| 89 |
-} |
|
| 90 |
- |
|
| 91 |
-func (x *Options) GetNoPivotRoot() bool {
|
|
| 92 |
- if x != nil {
|
|
| 93 |
- return x.NoPivotRoot |
|
| 94 |
- } |
|
| 95 |
- return false |
|
| 96 |
-} |
|
| 97 |
- |
|
| 98 |
-func (x *Options) GetNoNewKeyring() bool {
|
|
| 99 |
- if x != nil {
|
|
| 100 |
- return x.NoNewKeyring |
|
| 101 |
- } |
|
| 102 |
- return false |
|
| 103 |
-} |
|
| 104 |
- |
|
| 105 |
-func (x *Options) GetShimCgroup() string {
|
|
| 106 |
- if x != nil {
|
|
| 107 |
- return x.ShimCgroup |
|
| 108 |
- } |
|
| 109 |
- return "" |
|
| 110 |
-} |
|
| 111 |
- |
|
| 112 |
-func (x *Options) GetIoUid() uint32 {
|
|
| 113 |
- if x != nil {
|
|
| 114 |
- return x.IoUid |
|
| 115 |
- } |
|
| 116 |
- return 0 |
|
| 117 |
-} |
|
| 118 |
- |
|
| 119 |
-func (x *Options) GetIoGid() uint32 {
|
|
| 120 |
- if x != nil {
|
|
| 121 |
- return x.IoGid |
|
| 122 |
- } |
|
| 123 |
- return 0 |
|
| 124 |
-} |
|
| 125 |
- |
|
| 126 |
-func (x *Options) GetBinaryName() string {
|
|
| 127 |
- if x != nil {
|
|
| 128 |
- return x.BinaryName |
|
| 129 |
- } |
|
| 130 |
- return "" |
|
| 131 |
-} |
|
| 132 |
- |
|
| 133 |
-func (x *Options) GetRoot() string {
|
|
| 134 |
- if x != nil {
|
|
| 135 |
- return x.Root |
|
| 136 |
- } |
|
| 137 |
- return "" |
|
| 138 |
-} |
|
| 139 |
- |
|
| 140 |
-// Deprecated: Do not use. |
|
| 141 |
-func (x *Options) GetCriuPath() string {
|
|
| 142 |
- if x != nil {
|
|
| 143 |
- return x.CriuPath |
|
| 144 |
- } |
|
| 145 |
- return "" |
|
| 146 |
-} |
|
| 147 |
- |
|
| 148 |
-func (x *Options) GetSystemdCgroup() bool {
|
|
| 149 |
- if x != nil {
|
|
| 150 |
- return x.SystemdCgroup |
|
| 151 |
- } |
|
| 152 |
- return false |
|
| 153 |
-} |
|
| 154 |
- |
|
| 155 |
-func (x *Options) GetCriuImagePath() string {
|
|
| 156 |
- if x != nil {
|
|
| 157 |
- return x.CriuImagePath |
|
| 158 |
- } |
|
| 159 |
- return "" |
|
| 160 |
-} |
|
| 161 |
- |
|
| 162 |
-func (x *Options) GetCriuWorkPath() string {
|
|
| 163 |
- if x != nil {
|
|
| 164 |
- return x.CriuWorkPath |
|
| 165 |
- } |
|
| 166 |
- return "" |
|
| 167 |
-} |
|
| 168 |
- |
|
| 169 |
-type CheckpointOptions struct {
|
|
| 170 |
- state protoimpl.MessageState |
|
| 171 |
- sizeCache protoimpl.SizeCache |
|
| 172 |
- unknownFields protoimpl.UnknownFields |
|
| 173 |
- |
|
| 174 |
- // exit the container after a checkpoint |
|
| 175 |
- Exit bool `protobuf:"varint,1,opt,name=exit,proto3" json:"exit,omitempty"` |
|
| 176 |
- // checkpoint open tcp connections |
|
| 177 |
- OpenTcp bool `protobuf:"varint,2,opt,name=open_tcp,json=openTcp,proto3" json:"open_tcp,omitempty"` |
|
| 178 |
- // checkpoint external unix sockets |
|
| 179 |
- ExternalUnixSockets bool `protobuf:"varint,3,opt,name=external_unix_sockets,json=externalUnixSockets,proto3" json:"external_unix_sockets,omitempty"` |
|
| 180 |
- // checkpoint terminals (ptys) |
|
| 181 |
- Terminal bool `protobuf:"varint,4,opt,name=terminal,proto3" json:"terminal,omitempty"` |
|
| 182 |
- // allow checkpointing of file locks |
|
| 183 |
- FileLocks bool `protobuf:"varint,5,opt,name=file_locks,json=fileLocks,proto3" json:"file_locks,omitempty"` |
|
| 184 |
- // restore provided namespaces as empty namespaces |
|
| 185 |
- EmptyNamespaces []string `protobuf:"bytes,6,rep,name=empty_namespaces,json=emptyNamespaces,proto3" json:"empty_namespaces,omitempty"` |
|
| 186 |
- // set the cgroups mode, soft, full, strict |
|
| 187 |
- CgroupsMode string `protobuf:"bytes,7,opt,name=cgroups_mode,json=cgroupsMode,proto3" json:"cgroups_mode,omitempty"` |
|
| 188 |
- // checkpoint image path |
|
| 189 |
- ImagePath string `protobuf:"bytes,8,opt,name=image_path,json=imagePath,proto3" json:"image_path,omitempty"` |
|
| 190 |
- // checkpoint work path |
|
| 191 |
- WorkPath string `protobuf:"bytes,9,opt,name=work_path,json=workPath,proto3" json:"work_path,omitempty"` |
|
| 192 |
-} |
|
| 193 |
- |
|
| 194 |
-func (x *CheckpointOptions) Reset() {
|
|
| 195 |
- *x = CheckpointOptions{}
|
|
| 196 |
- if protoimpl.UnsafeEnabled {
|
|
| 197 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1] |
|
| 198 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 199 |
- ms.StoreMessageInfo(mi) |
|
| 200 |
- } |
|
| 201 |
-} |
|
| 202 |
- |
|
| 203 |
-func (x *CheckpointOptions) String() string {
|
|
| 204 |
- return protoimpl.X.MessageStringOf(x) |
|
| 205 |
-} |
|
| 206 |
- |
|
| 207 |
-func (*CheckpointOptions) ProtoMessage() {}
|
|
| 208 |
- |
|
| 209 |
-func (x *CheckpointOptions) ProtoReflect() protoreflect.Message {
|
|
| 210 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1] |
|
| 211 |
- if protoimpl.UnsafeEnabled && x != nil {
|
|
| 212 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 213 |
- if ms.LoadMessageInfo() == nil {
|
|
| 214 |
- ms.StoreMessageInfo(mi) |
|
| 215 |
- } |
|
| 216 |
- return ms |
|
| 217 |
- } |
|
| 218 |
- return mi.MessageOf(x) |
|
| 219 |
-} |
|
| 220 |
- |
|
| 221 |
-// Deprecated: Use CheckpointOptions.ProtoReflect.Descriptor instead. |
|
| 222 |
-func (*CheckpointOptions) Descriptor() ([]byte, []int) {
|
|
| 223 |
- return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{1}
|
|
| 224 |
-} |
|
| 225 |
- |
|
| 226 |
-func (x *CheckpointOptions) GetExit() bool {
|
|
| 227 |
- if x != nil {
|
|
| 228 |
- return x.Exit |
|
| 229 |
- } |
|
| 230 |
- return false |
|
| 231 |
-} |
|
| 232 |
- |
|
| 233 |
-func (x *CheckpointOptions) GetOpenTcp() bool {
|
|
| 234 |
- if x != nil {
|
|
| 235 |
- return x.OpenTcp |
|
| 236 |
- } |
|
| 237 |
- return false |
|
| 238 |
-} |
|
| 239 |
- |
|
| 240 |
-func (x *CheckpointOptions) GetExternalUnixSockets() bool {
|
|
| 241 |
- if x != nil {
|
|
| 242 |
- return x.ExternalUnixSockets |
|
| 243 |
- } |
|
| 244 |
- return false |
|
| 245 |
-} |
|
| 246 |
- |
|
| 247 |
-func (x *CheckpointOptions) GetTerminal() bool {
|
|
| 248 |
- if x != nil {
|
|
| 249 |
- return x.Terminal |
|
| 250 |
- } |
|
| 251 |
- return false |
|
| 252 |
-} |
|
| 253 |
- |
|
| 254 |
-func (x *CheckpointOptions) GetFileLocks() bool {
|
|
| 255 |
- if x != nil {
|
|
| 256 |
- return x.FileLocks |
|
| 257 |
- } |
|
| 258 |
- return false |
|
| 259 |
-} |
|
| 260 |
- |
|
| 261 |
-func (x *CheckpointOptions) GetEmptyNamespaces() []string {
|
|
| 262 |
- if x != nil {
|
|
| 263 |
- return x.EmptyNamespaces |
|
| 264 |
- } |
|
| 265 |
- return nil |
|
| 266 |
-} |
|
| 267 |
- |
|
| 268 |
-func (x *CheckpointOptions) GetCgroupsMode() string {
|
|
| 269 |
- if x != nil {
|
|
| 270 |
- return x.CgroupsMode |
|
| 271 |
- } |
|
| 272 |
- return "" |
|
| 273 |
-} |
|
| 274 |
- |
|
| 275 |
-func (x *CheckpointOptions) GetImagePath() string {
|
|
| 276 |
- if x != nil {
|
|
| 277 |
- return x.ImagePath |
|
| 278 |
- } |
|
| 279 |
- return "" |
|
| 280 |
-} |
|
| 281 |
- |
|
| 282 |
-func (x *CheckpointOptions) GetWorkPath() string {
|
|
| 283 |
- if x != nil {
|
|
| 284 |
- return x.WorkPath |
|
| 285 |
- } |
|
| 286 |
- return "" |
|
| 287 |
-} |
|
| 288 |
- |
|
| 289 |
-type ProcessDetails struct {
|
|
| 290 |
- state protoimpl.MessageState |
|
| 291 |
- sizeCache protoimpl.SizeCache |
|
| 292 |
- unknownFields protoimpl.UnknownFields |
|
| 293 |
- |
|
| 294 |
- // exec process id if the process is managed by a shim |
|
| 295 |
- ExecID string `protobuf:"bytes,1,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"` |
|
| 296 |
-} |
|
| 297 |
- |
|
| 298 |
-func (x *ProcessDetails) Reset() {
|
|
| 299 |
- *x = ProcessDetails{}
|
|
| 300 |
- if protoimpl.UnsafeEnabled {
|
|
| 301 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2] |
|
| 302 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 303 |
- ms.StoreMessageInfo(mi) |
|
| 304 |
- } |
|
| 305 |
-} |
|
| 306 |
- |
|
| 307 |
-func (x *ProcessDetails) String() string {
|
|
| 308 |
- return protoimpl.X.MessageStringOf(x) |
|
| 309 |
-} |
|
| 310 |
- |
|
| 311 |
-func (*ProcessDetails) ProtoMessage() {}
|
|
| 312 |
- |
|
| 313 |
-func (x *ProcessDetails) ProtoReflect() protoreflect.Message {
|
|
| 314 |
- mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2] |
|
| 315 |
- if protoimpl.UnsafeEnabled && x != nil {
|
|
| 316 |
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
|
| 317 |
- if ms.LoadMessageInfo() == nil {
|
|
| 318 |
- ms.StoreMessageInfo(mi) |
|
| 319 |
- } |
|
| 320 |
- return ms |
|
| 321 |
- } |
|
| 322 |
- return mi.MessageOf(x) |
|
| 323 |
-} |
|
| 324 |
- |
|
| 325 |
-// Deprecated: Use ProcessDetails.ProtoReflect.Descriptor instead. |
|
| 326 |
-func (*ProcessDetails) Descriptor() ([]byte, []int) {
|
|
| 327 |
- return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{2}
|
|
| 328 |
-} |
|
| 329 |
- |
|
| 330 |
-func (x *ProcessDetails) GetExecID() string {
|
|
| 331 |
- if x != nil {
|
|
| 332 |
- return x.ExecID |
|
| 333 |
- } |
|
| 334 |
- return "" |
|
| 335 |
-} |
|
| 336 |
- |
|
| 337 |
-var File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto protoreflect.FileDescriptor |
|
| 338 |
- |
|
| 339 |
-var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc = []byte{
|
|
| 340 |
- 0x0a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, |
|
| 341 |
- 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, |
|
| 342 |
- 0x72, 0x64, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, |
|
| 343 |
- 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6f, 0x63, 0x69, 0x2e, 0x70, |
|
| 344 |
- 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, |
|
| 345 |
- 0x2e, 0x72, 0x75, 0x6e, 0x63, 0x2e, 0x76, 0x31, 0x22, 0xed, 0x02, 0x0a, 0x07, 0x4f, 0x70, 0x74, |
|
| 346 |
- 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x6e, 0x6f, 0x5f, 0x70, 0x69, 0x76, 0x6f, 0x74, |
|
| 347 |
- 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x6e, 0x6f, 0x50, |
|
| 348 |
- 0x69, 0x76, 0x6f, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x6f, 0x5f, 0x6e, |
|
| 349 |
- 0x65, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, |
|
| 350 |
- 0x52, 0x0c, 0x6e, 0x6f, 0x4e, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1f, |
|
| 351 |
- 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x6d, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, |
|
| 352 |
- 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x69, 0x6d, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, |
|
| 353 |
- 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, |
|
| 354 |
- 0x05, 0x69, 0x6f, 0x55, 0x69, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x67, 0x69, 0x64, |
|
| 355 |
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6f, 0x47, 0x69, 0x64, 0x12, 0x1f, 0x0a, |
|
| 356 |
- 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, |
|
| 357 |
- 0x28, 0x09, 0x52, 0x0a, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, |
|
| 358 |
- 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, |
|
| 359 |
- 0x6f, 0x74, 0x12, 0x1f, 0x0a, 0x09, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, |
|
| 360 |
- 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x08, 0x63, 0x72, 0x69, 0x75, 0x50, |
|
| 361 |
- 0x61, 0x74, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x64, 0x5f, 0x63, |
|
| 362 |
- 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x79, 0x73, |
|
| 363 |
- 0x74, 0x65, 0x6d, 0x64, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x72, |
|
| 364 |
- 0x69, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, |
|
| 365 |
- 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x72, 0x69, 0x75, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, |
|
| 366 |
- 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x5f, |
|
| 367 |
- 0x70, 0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x69, 0x75, |
|
| 368 |
- 0x57, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0xbb, 0x02, 0x0a, 0x11, 0x43, 0x68, 0x65, |
|
| 369 |
- 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, |
|
| 370 |
- 0x0a, 0x04, 0x65, 0x78, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x65, 0x78, |
|
| 371 |
- 0x69, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x74, 0x63, 0x70, 0x18, 0x02, |
|
| 372 |
- 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x6e, 0x54, 0x63, 0x70, 0x12, 0x32, 0x0a, |
|
| 373 |
- 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x73, |
|
| 374 |
- 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, |
|
| 375 |
- 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x55, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, |
|
| 376 |
- 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, |
|
| 377 |
- 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x12, 0x1d, 0x0a, |
|
| 378 |
- 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, |
|
| 379 |
- 0x08, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x10, |
|
| 380 |
- 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, |
|
| 381 |
- 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x4e, 0x61, 0x6d, |
|
| 382 |
- 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x67, 0x72, 0x6f, 0x75, |
|
| 383 |
- 0x70, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, |
|
| 384 |
- 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6d, |
|
| 385 |
- 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, |
|
| 386 |
- 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x6f, 0x72, |
|
| 387 |
- 0x6b, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, |
|
| 388 |
- 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0x29, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, |
|
| 389 |
- 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x78, 0x65, 0x63, |
|
| 390 |
- 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x78, 0x65, 0x63, 0x49, |
|
| 391 |
- 0x64, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, |
|
| 392 |
- 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, |
|
| 393 |
- 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, |
|
| 394 |
- 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x6f, 0x70, |
|
| 395 |
- 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, |
|
| 396 |
-} |
|
| 397 |
- |
|
| 398 |
-var ( |
|
| 399 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescOnce sync.Once |
|
| 400 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData = file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc |
|
| 401 |
-) |
|
| 402 |
- |
|
| 403 |
-func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP() []byte {
|
|
| 404 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescOnce.Do(func() {
|
|
| 405 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData) |
|
| 406 |
- }) |
|
| 407 |
- return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData |
|
| 408 |
-} |
|
| 409 |
- |
|
| 410 |
-var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes = make([]protoimpl.MessageInfo, 3) |
|
| 411 |
-var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes = []interface{}{
|
|
| 412 |
- (*Options)(nil), // 0: containerd.runc.v1.Options |
|
| 413 |
- (*CheckpointOptions)(nil), // 1: containerd.runc.v1.CheckpointOptions |
|
| 414 |
- (*ProcessDetails)(nil), // 2: containerd.runc.v1.ProcessDetails |
|
| 415 |
-} |
|
| 416 |
-var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs = []int32{
|
|
| 417 |
- 0, // [0:0] is the sub-list for method output_type |
|
| 418 |
- 0, // [0:0] is the sub-list for method input_type |
|
| 419 |
- 0, // [0:0] is the sub-list for extension type_name |
|
| 420 |
- 0, // [0:0] is the sub-list for extension extendee |
|
| 421 |
- 0, // [0:0] is the sub-list for field type_name |
|
| 422 |
-} |
|
| 423 |
- |
|
| 424 |
-func init() { file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_init() }
|
|
| 425 |
-func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_init() {
|
|
| 426 |
- if File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto != nil {
|
|
| 427 |
- return |
|
| 428 |
- } |
|
| 429 |
- if !protoimpl.UnsafeEnabled {
|
|
| 430 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
|
| 431 |
- switch v := v.(*Options); i {
|
|
| 432 |
- case 0: |
|
| 433 |
- return &v.state |
|
| 434 |
- case 1: |
|
| 435 |
- return &v.sizeCache |
|
| 436 |
- case 2: |
|
| 437 |
- return &v.unknownFields |
|
| 438 |
- default: |
|
| 439 |
- return nil |
|
| 440 |
- } |
|
| 441 |
- } |
|
| 442 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
|
| 443 |
- switch v := v.(*CheckpointOptions); i {
|
|
| 444 |
- case 0: |
|
| 445 |
- return &v.state |
|
| 446 |
- case 1: |
|
| 447 |
- return &v.sizeCache |
|
| 448 |
- case 2: |
|
| 449 |
- return &v.unknownFields |
|
| 450 |
- default: |
|
| 451 |
- return nil |
|
| 452 |
- } |
|
| 453 |
- } |
|
| 454 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
|
| 455 |
- switch v := v.(*ProcessDetails); i {
|
|
| 456 |
- case 0: |
|
| 457 |
- return &v.state |
|
| 458 |
- case 1: |
|
| 459 |
- return &v.sizeCache |
|
| 460 |
- case 2: |
|
| 461 |
- return &v.unknownFields |
|
| 462 |
- default: |
|
| 463 |
- return nil |
|
| 464 |
- } |
|
| 465 |
- } |
|
| 466 |
- } |
|
| 467 |
- type x struct{}
|
|
| 468 |
- out := protoimpl.TypeBuilder{
|
|
| 469 |
- File: protoimpl.DescBuilder{
|
|
| 470 |
- GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
|
| 471 |
- RawDescriptor: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc, |
|
| 472 |
- NumEnums: 0, |
|
| 473 |
- NumMessages: 3, |
|
| 474 |
- NumExtensions: 0, |
|
| 475 |
- NumServices: 0, |
|
| 476 |
- }, |
|
| 477 |
- GoTypes: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes, |
|
| 478 |
- DependencyIndexes: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs, |
|
| 479 |
- MessageInfos: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes, |
|
| 480 |
- }.Build() |
|
| 481 |
- File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto = out.File |
|
| 482 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc = nil |
|
| 483 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes = nil |
|
| 484 |
- file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs = nil |
|
| 485 |
-} |
| 486 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,61 +0,0 @@ |
| 1 |
-syntax = "proto3"; |
|
| 2 |
- |
|
| 3 |
-package containerd.runc.v1; |
|
| 4 |
- |
|
| 5 |
-option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options"; |
|
| 6 |
- |
|
| 7 |
-message Options {
|
|
| 8 |
- // disable pivot root when creating a container |
|
| 9 |
- bool no_pivot_root = 1; |
|
| 10 |
- // create a new keyring for the container |
|
| 11 |
- bool no_new_keyring = 2; |
|
| 12 |
- // place the shim in a cgroup |
|
| 13 |
- string shim_cgroup = 3; |
|
| 14 |
- // set the I/O's pipes uid |
|
| 15 |
- uint32 io_uid = 4; |
|
| 16 |
- // set the I/O's pipes gid |
|
| 17 |
- uint32 io_gid = 5; |
|
| 18 |
- // binary name of the runc binary |
|
| 19 |
- string binary_name = 6; |
|
| 20 |
- // runc root directory |
|
| 21 |
- string root = 7; |
|
| 22 |
- // criu binary path. |
|
| 23 |
- // |
|
| 24 |
- // Deprecated: runc option --criu is now ignored (with a warning), and the |
|
| 25 |
- // option will be removed entirely in a future release. Users who need a non- |
|
| 26 |
- // standard criu binary should rely on the standard way of looking up binaries |
|
| 27 |
- // in $PATH. |
|
| 28 |
- string criu_path = 8 [deprecated = true]; |
|
| 29 |
- // enable systemd cgroups |
|
| 30 |
- bool systemd_cgroup = 9; |
|
| 31 |
- // criu image path |
|
| 32 |
- string criu_image_path = 10; |
|
| 33 |
- // criu work path |
|
| 34 |
- string criu_work_path = 11; |
|
| 35 |
-} |
|
| 36 |
- |
|
| 37 |
-message CheckpointOptions {
|
|
| 38 |
- // exit the container after a checkpoint |
|
| 39 |
- bool exit = 1; |
|
| 40 |
- // checkpoint open tcp connections |
|
| 41 |
- bool open_tcp = 2; |
|
| 42 |
- // checkpoint external unix sockets |
|
| 43 |
- bool external_unix_sockets = 3; |
|
| 44 |
- // checkpoint terminals (ptys) |
|
| 45 |
- bool terminal = 4; |
|
| 46 |
- // allow checkpointing of file locks |
|
| 47 |
- bool file_locks = 5; |
|
| 48 |
- // restore provided namespaces as empty namespaces |
|
| 49 |
- repeated string empty_namespaces = 6; |
|
| 50 |
- // set the cgroups mode, soft, full, strict |
|
| 51 |
- string cgroups_mode = 7; |
|
| 52 |
- // checkpoint image path |
|
| 53 |
- string image_path = 8; |
|
| 54 |
- // checkpoint work path |
|
| 55 |
- string work_path = 9; |
|
| 56 |
-} |
|
| 57 |
- |
|
| 58 |
-message ProcessDetails {
|
|
| 59 |
- // exec process id if the process is managed by a shim |
|
| 60 |
- string exec_id = 1; |
|
| 61 |
-} |
| ... | ... |
@@ -136,7 +136,7 @@ func (s *service) Delete(ctx context.Context, req *api.DeleteContentRequest) (*p |
| 136 | 136 |
log.G(ctx).WithField("digest", req.Digest).Debugf("delete content")
|
| 137 | 137 |
dg, err := digest.Parse(req.Digest) |
| 138 | 138 |
if err != nil {
|
| 139 |
- return nil, status.Errorf(codes.InvalidArgument, err.Error()) |
|
| 139 |
+ return nil, status.Error(codes.InvalidArgument, err.Error()) |
|
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
if err := s.store.Delete(ctx, dg); err != nil {
|
| ... | ... |
@@ -98,7 +98,7 @@ func (l *Local) UpdateLocal(root string) {
|
| 98 | 98 |
func (l *Local) Plugins(ctx context.Context, req *api.PluginsRequest, _ ...grpc.CallOption) (*api.PluginsResponse, error) {
|
| 99 | 99 |
filter, err := filters.ParseAll(req.Filters...) |
| 100 | 100 |
if err != nil {
|
| 101 |
- return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, err.Error()) |
|
| 101 |
+ return nil, errdefs.ToGRPC(err) |
|
| 102 | 102 |
} |
| 103 | 103 |
|
| 104 | 104 |
var plugins []*api.Plugin |
| ... | ... |
@@ -30,6 +30,7 @@ import ( |
| 30 | 30 |
|
| 31 | 31 |
"github.com/containerd/containerd/api/services/tasks/v1" |
| 32 | 32 |
"github.com/containerd/containerd/api/types" |
| 33 |
+ "github.com/containerd/containerd/api/types/runc/options" |
|
| 33 | 34 |
"github.com/containerd/containerd/cio" |
| 34 | 35 |
"github.com/containerd/containerd/content" |
| 35 | 36 |
"github.com/containerd/containerd/diff" |
| ... | ... |
@@ -42,7 +43,6 @@ import ( |
| 42 | 42 |
google_protobuf "github.com/containerd/containerd/protobuf/types" |
| 43 | 43 |
"github.com/containerd/containerd/rootfs" |
| 44 | 44 |
"github.com/containerd/containerd/runtime/linux/runctypes" |
| 45 |
- "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 46 | 45 |
"github.com/containerd/typeurl/v2" |
| 47 | 46 |
digest "github.com/opencontainers/go-digest" |
| 48 | 47 |
is "github.com/opencontainers/image-spec/specs-go" |
| ... | ... |
@@ -24,12 +24,12 @@ import ( |
| 24 | 24 |
"syscall" |
| 25 | 25 |
|
| 26 | 26 |
"github.com/containerd/containerd/api/types" |
| 27 |
+ "github.com/containerd/containerd/api/types/runc/options" |
|
| 27 | 28 |
"github.com/containerd/containerd/content" |
| 28 | 29 |
"github.com/containerd/containerd/errdefs" |
| 29 | 30 |
"github.com/containerd/containerd/images" |
| 30 | 31 |
"github.com/containerd/containerd/mount" |
| 31 | 32 |
"github.com/containerd/containerd/runtime/linux/runctypes" |
| 32 |
- "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 33 | 33 |
imagespec "github.com/opencontainers/image-spec/specs-go/v1" |
| 34 | 34 |
"github.com/opencontainers/runtime-spec/specs-go" |
| 35 | 35 |
) |
| ... | ... |
@@ -22,8 +22,8 @@ import ( |
| 22 | 22 |
"context" |
| 23 | 23 |
"errors" |
| 24 | 24 |
|
| 25 |
+ "github.com/containerd/containerd/api/types/runc/options" |
|
| 25 | 26 |
"github.com/containerd/containerd/runtime/linux/runctypes" |
| 26 |
- "github.com/containerd/containerd/runtime/v2/runc/options" |
|
| 27 | 27 |
) |
| 28 | 28 |
|
| 29 | 29 |
// WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage. |
| ... | ... |
@@ -23,7 +23,7 @@ var ( |
| 23 | 23 |
Package = "github.com/containerd/containerd" |
| 24 | 24 |
|
| 25 | 25 |
// Version holds the complete version number. Filled in at linking time. |
| 26 |
- Version = "1.7.24+unknown" |
|
| 26 |
+ Version = "1.7.25+unknown" |
|
| 27 | 27 |
|
| 28 | 28 |
// Revision is filled with the VCS (e.g. git) revision being used to build |
| 29 | 29 |
// the program at linking time. |
| ... | ... |
@@ -256,7 +256,7 @@ github.com/containerd/cgroups/v3/cgroup2/stats |
| 256 | 256 |
# github.com/containerd/console v1.0.4 |
| 257 | 257 |
## explicit; go 1.13 |
| 258 | 258 |
github.com/containerd/console |
| 259 |
-# github.com/containerd/containerd v1.7.24 |
|
| 259 |
+# github.com/containerd/containerd v1.7.25 |
|
| 260 | 260 |
## explicit; go 1.21 |
| 261 | 261 |
github.com/containerd/containerd |
| 262 | 262 |
github.com/containerd/containerd/archive |
| ... | ... |
@@ -319,7 +319,6 @@ github.com/containerd/containerd/remotes/docker/schema1 |
| 319 | 319 |
github.com/containerd/containerd/remotes/errors |
| 320 | 320 |
github.com/containerd/containerd/rootfs |
| 321 | 321 |
github.com/containerd/containerd/runtime/linux/runctypes |
| 322 |
-github.com/containerd/containerd/runtime/v2/runc/options |
|
| 323 | 322 |
github.com/containerd/containerd/sandbox |
| 324 | 323 |
github.com/containerd/containerd/sandbox/proxy |
| 325 | 324 |
github.com/containerd/containerd/services |
| ... | ... |
@@ -351,6 +350,7 @@ github.com/containerd/containerd/api/services/tasks/v1 |
| 351 | 351 |
github.com/containerd/containerd/api/services/transfer/v1 |
| 352 | 352 |
github.com/containerd/containerd/api/services/version/v1 |
| 353 | 353 |
github.com/containerd/containerd/api/types |
| 354 |
+github.com/containerd/containerd/api/types/runc/options |
|
| 354 | 355 |
github.com/containerd/containerd/api/types/task |
| 355 | 356 |
github.com/containerd/containerd/api/types/transfer |
| 356 | 357 |
# github.com/containerd/continuity v0.4.5 |