Skip to content

Integrate runsc shim with containerd 2.1. #13113

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Integrate runsc shim with containerd 2.1. #13113

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 137 additions & 28 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,29 +139,40 @@ use_repo(
"com_github_burntsushi_toml",
"com_github_cenkalti_backoff",
"com_github_cilium_ebpf",
"com_github_containerd_cgroups",
"com_github_containerd_cgroups_v3",
"com_github_containerd_console",
"com_github_containerd_containerd",
"com_github_containerd_containerd_api",
"com_github_containerd_containerd_v2",
"com_github_containerd_continuity",
"com_github_containerd_errdefs",
"com_github_containerd_errdefs_pkg",
"com_github_containerd_fifo",
"com_github_containerd_go_runc",
"com_github_containerd_log",
"com_github_containerd_plugin",
"com_github_containerd_ttrpc",
"com_github_containerd_typeurl",
"com_github_containerd_typeurl_v2",
"com_github_coreos_go_systemd_v22",
"com_github_creack_pty",
"com_github_distribution_reference",
"com_github_docker_docker",
"com_github_docker_go_connections",
"com_github_docker_go_units",
"com_github_emicklei_go_restful_v3",
"com_github_felixge_httpsnoop",
"com_github_fxamacker_cbor_v2",
"com_github_go_echarts_go_echarts_v2",
"com_github_go_logr_logr",
"com_github_go_logr_stdr",
"com_github_go_openapi_jsonpointer",
"com_github_go_openapi_jsonreference",
"com_github_go_openapi_swag",
"com_github_godbus_dbus_v5",
"com_github_gofrs_flock",
"com_github_gogo_protobuf",
"com_github_golang_protobuf",
"com_github_google_btree",
"com_github_google_gnostic_models",
"com_github_google_go_cmp",
"com_github_google_go_github_v56",
"com_github_google_go_querystring",
Expand All @@ -176,18 +187,29 @@ use_repo(
"com_github_hanwen_go_fuse_v2",
"com_github_ianlancetaylor_demangle",
"com_github_imdario_mergo",
"com_github_josharian_intern",
"com_github_mailru_easyjson",
"com_github_mattbaird_jsonpatch",
"com_github_matttproud_golang_protobuf_extensions",
"com_github_mdlayher_socket",
"com_github_mdlayher_vsock",
"com_github_moby_docker_image_spec",
"com_github_moby_sys_capability",
"com_github_moby_sys_sequential",
"com_github_moby_sys_signal",
"com_github_moby_sys_symlink",
"com_github_moby_sys_user",
"com_github_moby_sys_userns",
"com_github_mohae_deepcopy",
"com_github_munnerz_goautoneg",
"com_github_opencontainers_image_spec",
"com_github_opencontainers_runtime_spec",
"com_github_prometheus_client_model",
"com_github_prometheus_common",
"com_github_sirupsen_logrus",
"com_github_spf13_pflag",
"com_github_vishvananda_netlink",
"com_github_x448_float16",
"com_github_xeipuuv_gojsonpointer",
"com_github_xeipuuv_gojsonreference",
"com_github_xeipuuv_gojsonschema",
Expand All @@ -198,6 +220,7 @@ use_repo(
"com_google_cloud_go_compute_metadata",
"com_google_cloud_go_container",
"com_google_cloud_go_iam",
"in_gopkg_evanphx_json_patch_v4",
"in_gopkg_yaml_v2",
"in_gopkg_yaml_v3",
"io_k8s_api",
Expand All @@ -221,13 +244,14 @@ use_repo(
"org_golang_x_oauth2",
"org_golang_x_sync",
"org_golang_x_sys",
"org_golang_x_telemetry",
"org_golang_x_term",
"org_golang_x_time",
"org_golang_x_tools",
"org_golang_x_xerrors",
"org_uber_go_atomic",
"org_uber_go_multierr",
)

go_deps.module(
path = "cloud.google.com/go/auth",
sum = "h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=",
Expand Down Expand Up @@ -400,8 +424,8 @@ go_deps.module(
)
go_deps.module(
path = "github.com/google/uuid",
sum = "h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=",
version = "v1.3.0",
sum = "h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=",
version = "v1.6.0",
)
go_deps.module(
path = "github.com/googleapis/enterprise-certificate-proxy",
Expand Down Expand Up @@ -524,39 +548,124 @@ go_deps.module(
version = "v1.0.1",
)
go_deps.module(
path = "github.com/containerd/containerd",
sum = "h1:Bcj0ZXqgIs6GG+YbaKkMX3Dap0JsIVG4UYFOLRo7iX4=",
version = "v1.6.36",
path = "github.com/containerd/log",
sum = "h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=",
version = "v0.1.0",
)
go_deps.module(
path = "github.com/containerd/cgroups",
sum = "h1:iJnMvco9XGvKUvNQkv88bE4uJXxRQH18efbKo9w5vHQ=",
version = "v1.0.1",
path = "github.com/googleapis/gnostic",
sum = "h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=",
version = "v0.5.5",
)
go_deps.module(
path = "github.com/containerd/errdefs",
sum = "h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=",
version = "v0.1.0",
path = "github.com/fxamacker/cbor/v2",
sum = "h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=",
version = "v2.7.0",
)
go_deps.module(
path = "github.com/containerd/log",
sum = "h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=",
path = "github.com/x448/float16",
sum = "h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=",
version = "v0.8.4",
)
go_deps.module(
path = "github.com/moby/sys/userns",
sum = "h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=",
version = "v0.1.0",
)
go_deps.module(
path = "github.com/googleapis/gnostic",
sum = "h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=",
version = "v0.5.5",
path = "github.com/docker/go-units",
sum = "h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=",
version = "v0.5.0",
)
go_deps.module(
path = "k8s.io/api",
sum = "h1:op+yeqZLQxDt2tEnrOP9Y+WA7l4Lxh+7R0IWEzyuk2I=",
version = "v0.23.16",
path = "github.com/mdlayher/vsock",
sum = "h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=",
version = "v1.2.1",
)
go_deps.module(
path = "k8s.io/apimachinery",
sum = "h1:f6Q+3qYv3qWvbDZp2iUhwC2rzMRBkSb7JYBhmeVK5pc=",
version = "v0.23.16",
path = "github.com/mdlayher/socket",
sum = "h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=",
version = "v0.5.1",
)
go_deps.module(
path = "github.com/containerd/continuity",
sum = "h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=",
version = "v0.4.5",
)
go_deps.module(
path = "github.com/moby/sys/user",
sum = "h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=",
version = "v0.4.0",
)
go_deps.module(
path = "github.com/moby/sys/sequential",
sum = "h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=",
version = "v0.6.0",
)
go_deps.module(
path = "github.com/moby/sys/signal",
sum = "h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0=",
version = "v0.7.1",
)
go_deps.module(
path = "github.com/moby/sys/symlink",
sum = "h1:GZX89mEZ9u53f97npBy4Rc3vJKj7JBDj/PN2I22GrNU=",
version = "v0.3.0",
)
go_deps.module(
path = "github.com/munnerz/goautoneg",
sum = "h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=",
version = "v0.0.0-20191010083416-a7dc8b61c822",
)
go_deps.module(
path = "github.com/google/gnostic-models",
sum = "h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=",
version = "v0.6.8",
)
go_deps.module(
path = "gopkg.in/evanphx/json-patch.v4",
sum = "h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=",
version = "v4.12.0",
)
go_deps.module(
path = "github.com/go-openapi/jsonreference",
sum = "h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=",
version = "v0.20.2",
)
go_deps.module(
path = "github.com/go-openapi/jsonpointer",
sum = "h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=",
version = "v0.21.0",
)
go_deps.module(
path = "github.com/go-openapi/swag",
sum = "h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=",
version = "v0.23.0",
)
go_deps.module(
path = "github.com/emicklei/go-restful/v3",
sum = "h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=",
version = "v3.11.0",
)
go_deps.module(
path = "github.com/mailru/easyjson",
sum = "h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=",
version = "v0.7.7",
)
go_deps.module(
path = "github.com/josharian/intern",
sum = "h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=",
version = "v1.0.0",
)
go_deps.module(
path = "golang.org/x/telemetry",
sum = "h1:dHQOQddU4YHS5gY33/6klKjq7Gp3WwMyOXGNp5nzRj8=",
version = "v0.0.0-20250908211612-aef8a434d053",
)
go_deps.module(
path = "golang.org/x/xerrors",
sum = "h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=",
version = "v0.0.0-20220907171357-04be3eba64a2",
)
go_deps.gazelle_override(
directives = [
Expand All @@ -568,13 +677,13 @@ go_deps.gazelle_override(
directives = [
"gazelle:proto disable",
],
path = "github.com/containerd/containerd",
path = "github.com/containerd/containerd/v2",
)
go_deps.gazelle_override(
directives = [
"gazelle:proto disable",
],
path = "github.com/containerd/cgroups",
path = "github.com/containerd/cgroups/v3",
)
go_deps.gazelle_override(
directives = [
Expand Down
86 changes: 47 additions & 39 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ go 1.25.5

require (
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c
github.com/bazelbuild/rules_go v0.44.2
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cilium/ebpf v0.12.3
github.com/containerd/cgroups v1.0.4
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.6.36
github.com/containerd/errdefs v0.1.0
github.com/containerd/fifo v1.0.0
github.com/containerd/go-runc v1.0.0
github.com/cilium/ebpf v0.16.0
github.com/containerd/cgroups/v3 v3.0.5
github.com/containerd/console v1.0.4
github.com/containerd/containerd/api v1.10.0
github.com/containerd/containerd/v2 v2.1.5
github.com/containerd/errdefs v1.0.0
github.com/containerd/errdefs/pkg v0.3.0
github.com/containerd/fifo v1.1.0
github.com/containerd/go-runc v1.1.0
github.com/containerd/log v0.1.0
github.com/containerd/typeurl v1.0.2
github.com/containerd/plugin v1.0.0
github.com/containerd/ttrpc v1.2.7
github.com/containerd/typeurl/v2 v2.2.3
github.com/coreos/go-systemd/v22 v22.6.0
github.com/creack/pty v1.1.24
github.com/godbus/dbus/v5 v5.1.0
Expand All @@ -27,61 +30,66 @@ require (
github.com/mohae/deepcopy v0.0.0-20170308212314-bb9b5e7adda9
github.com/opencontainers/runtime-spec v1.2.1
github.com/sirupsen/logrus v1.9.3
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
github.com/vishvananda/netlink v1.3.1-0.20250303224720-0e7078ed04c8
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
golang.org/x/mod v0.28.0
golang.org/x/sync v0.17.0
golang.org/x/sys v0.36.0
golang.org/x/time v0.12.0
golang.org/x/tools v0.37.0
google.golang.org/grpc v1.75.1
google.golang.org/protobuf v1.36.8
k8s.io/api v0.23.16
k8s.io/apimachinery v0.23.16
k8s.io/client-go v0.23.16
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
)

require (
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Microsoft/hcsshim v0.9.12 // indirect
github.com/containerd/ttrpc v1.1.2 // indirect
github.com/creack/pty v1.1.24 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.13.0 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mdlayher/socket v0.5.1 // indirect
github.com/mdlayher/vsock v1.2.1 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
github.com/vishvananda/netns v0.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
golang.org/x/term v0.35.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.249.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/grpc v1.75.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading
Loading