9 files changed, 6 insertions, 103 deletions
diff --git a/shim/BUILD b/shim/BUILD
deleted file mode 100644
index 8d29c459b..000000000
--- a/shim/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools:defs.bzl", "pkg_tar")
-
-package(licenses = ["notice"])
-
-pkg_tar(
-    name = "config",
-    srcs = [
-        "runsc.toml",
-    ],
-    mode = "0644",
-    package_dir = "/etc/containerd",
-    visibility = [
-        "//visibility:public",
-    ],
-)
diff --git a/shim/README.md b/shim/README.md
deleted file mode 100644
index 75daf00ac..000000000
--- a/shim/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Shim Overview
-
-Integration with containerd is done via a [shim][shims]. There are various shims
-supported for different versions of [containerd][containerd].
-
--   [Containerd 1.2+ (shim v2)](https://gvisor.dev/docs/user_guide/containerd/quick_start/)
--   [Containerd 1.1 (shim v1)](https://gvisor.dev/docs/user_guide/containerd/containerd_11/)
-
-[containerd]: https://github.com/containerd/containerd
-[shims]: https://iximiuz.com/en/posts/implementing-container-runtime-shim/
diff --git a/shim/runsc.toml b/shim/runsc.toml
deleted file mode 100644
index e1c7de1bb..000000000
--- a/shim/runsc.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is an example configuration file for runsc.
-#
-# By default, it will be parsed from /etc/containerd/runsc.toml, but see the
-# static path configured in v1/main.go. Note that the configuration mechanism
-# for newer container shim versions is different: see the documentation in v2.
-[runsc_config]
diff --git a/shim/v1/BUILD b/shim/v1/BUILD
deleted file mode 100644
index 3614a67d1..000000000
--- a/shim/v1/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-load("//tools:defs.bzl", "go_binary")
-
-package(licenses = ["notice"])
-
-go_binary(
-    name = "gvisor-containerd-shim",
-    srcs = ["main.go"],
-    static = True,
-    visibility = [
-        "//visibility:public",
-    ],
-    deps = ["//shim/v1/cli"],
-)
diff --git a/shim/v1/cli/BUILD b/shim/v1/cli/BUILD
deleted file mode 100644
index 0bbdc4add..000000000
--- a/shim/v1/cli/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-load("//tools:defs.bzl", "go_library")
-
-package(licenses = ["notice"])
-
-go_library(
-    name = "cli",
-    srcs = [
-        "api.go",
-        "cli.go",
-        "config.go",
-    ],
-    visibility = [
-        "//:__pkg__",
-        "//shim/v1:__pkg__",
-    ],
-    deps = [
-        "//pkg/shim/runsc",
-        "//pkg/shim/v1/shim",
-        "@com_github_burntsushi_toml//:go_default_library",
-        "@com_github_containerd_containerd//events:go_default_library",
-        "@com_github_containerd_containerd//namespaces:go_default_library",
-        "@com_github_containerd_containerd//runtime/v1/shim/v1:go_default_library",
-        "@com_github_containerd_containerd//sys:go_default_library",
-        "@com_github_containerd_containerd//sys/reaper:go_default_library",
-        "@com_github_containerd_ttrpc//:go_default_library",
-        "@com_github_containerd_typeurl//:go_default_library",
-        "@com_github_gogo_protobuf//types:go_default_library",
-        "@org_golang_x_sys//unix:go_default_library",
-    ],
-)
diff --git a/shim/v1/cli/cli_state_autogen.go b/shim/v1/cli/cli_state_autogen.go
new file mode 100644
index 000000000..e81991e0b
--- /dev/null
+++ b/shim/v1/cli/cli_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package cli
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_state_autogen.go b/shim/v2/cli/cli_state_autogen.go
new file mode 100644
index 000000000..e81991e0b
--- /dev/null
+++ b/shim/v2/cli/cli_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package cli