summaryrefslogtreecommitdiffhomepage
path: root/shim/v2
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2021-01-12 17:50:33 -0800
committergVisor bot <gvisor-bot@google.com>2021-01-12 17:54:10 -0800
commit8b0f0b4d11e0938eec8da411323b2ce35976ab56 (patch)
treeaab8e37ca51133da5bfa4a055ea0dfa0bda514cf /shim/v2
parentbe2b9d75d75e0e7371cd868589d57f4ddee44781 (diff)
Delete shim v1
gvisor-containerd-shim is not compatible with containerd 1.1 or earlier. Starting from containerd 1.2, shim v2 is the preferred interface. PiperOrigin-RevId: 351485556
Diffstat (limited to 'shim/v2')
-rw-r--r--shim/v2/BUILD13
-rw-r--r--shim/v2/cli/BUILD16
-rw-r--r--shim/v2/cli/cli.go28
-rw-r--r--shim/v2/main.go24
4 files changed, 0 insertions, 81 deletions
diff --git a/shim/v2/BUILD b/shim/v2/BUILD
deleted file mode 100644
index b4a107d27..000000000
--- a/shim/v2/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-load("//tools:defs.bzl", "go_binary")
-
-package(licenses = ["notice"])
-
-go_binary(
- name = "containerd-shim-runsc-v1",
- srcs = ["main.go"],
- static = True,
- visibility = [
- "//visibility:public",
- ],
- deps = ["//shim/v2/cli"],
-)
diff --git a/shim/v2/cli/BUILD b/shim/v2/cli/BUILD
deleted file mode 100644
index 6681e0772..000000000
--- a/shim/v2/cli/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-load("//tools:defs.bzl", "go_library")
-
-package(licenses = ["notice"])
-
-go_library(
- name = "cli",
- srcs = ["cli.go"],
- visibility = [
- "//:__pkg__",
- "//shim/v2:__pkg__",
- ],
- deps = [
- "//pkg/shim/v2",
- "@com_github_containerd_containerd//runtime/v2/shim:go_default_library",
- ],
-)
diff --git a/shim/v2/cli/cli.go b/shim/v2/cli/cli.go
deleted file mode 100644
index 3d6644feb..000000000
--- a/shim/v2/cli/cli.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2018 The containerd Authors.
-// Copyright 2019 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 cli defines the command line interface for the V2 shim.
-package cli
-
-import (
- "github.com/containerd/containerd/runtime/v2/shim"
-
- "gvisor.dev/gvisor/pkg/shim/v2"
-)
-
-// Main is the main entrypoint.
-func Main() {
- shim.Run("io.containerd.runsc.v1", v2.New)
-}
diff --git a/shim/v2/main.go b/shim/v2/main.go
deleted file mode 100644
index 3680cdf9c..000000000
--- a/shim/v2/main.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2020 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.
-
-// Binary containerd-shim-runsc-v1 is the v2 containerd shim (implementing the formal v1 API).
-package main
-
-import (
- "gvisor.dev/gvisor/shim/v2/cli"
-)
-
-func main() {
- cli.Main()
-}