diff options
author | Fabricio Voznika <fvoznika@google.com> | 2021-10-25 13:13:56 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-10-25 13:17:25 -0700 |
commit | 9262ea47a5d93d44b14f298663982b75ed2e4898 (patch) | |
tree | a7f1c8e67d9c3180e30f309186e63a83aa099449 /pkg/shim/runtimeoptions/runtimeoptions.go | |
parent | 7c267106d1d7d162d6204e6b0402d3063b1bf468 (diff) |
Add support for containerd 1.5
"cri.runtimeoptions.v1" moved to "runtimeoptions.v1" and containerd
configuration format version 2 is required.
Updates #6449
PiperOrigin-RevId: 405474653
Diffstat (limited to 'pkg/shim/runtimeoptions/runtimeoptions.go')
-rw-r--r-- | pkg/shim/runtimeoptions/runtimeoptions.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkg/shim/runtimeoptions/runtimeoptions.go b/pkg/shim/runtimeoptions/runtimeoptions.go index e76d73ea7..c3a3b664f 100644 --- a/pkg/shim/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/runtimeoptions/runtimeoptions.go @@ -13,12 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package runtimeoptions contains the runtimeoptions proto. +// Package runtimeoptions contains the runtimeoptions proto for containerd 1.5 +// and above. package runtimeoptions - -import proto "github.com/gogo/protobuf/proto" - -func init() { - // TODO(gvisor.dev/issue/6449): Upgrade runtimeoptions.proto after upgrading to containerd 1.5 - proto.RegisterType((*Options)(nil), "runtimeoptions.v1.Options") -} |