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/v14/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/v14/runtimeoptions.go')
-rw-r--r-- | pkg/shim/runtimeoptions/v14/runtimeoptions.go | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkg/shim/runtimeoptions/v14/runtimeoptions.go b/pkg/shim/runtimeoptions/v14/runtimeoptions.go new file mode 100644 index 000000000..7b34a1f6b --- /dev/null +++ b/pkg/shim/runtimeoptions/v14/runtimeoptions.go @@ -0,0 +1,20 @@ +// Copyright 2018 The containerd Authors. +// Copyright 2018 The gVisor Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package v14 contains the runtimeoptions proto for containerd 1.4 and earlier. +// The package for runtimeoptions proto changed from "cri.runtimeoptions.v1" to +// "runtimeoptions.v1" in 1.5, So keep both versions until 1.4 doesn't need to +// be supported anymore. +package v14 |