diff --git a/BUILD b/BUILD
index 043c474..759a9b8 100644
--- a/BUILD
+++ b/BUILD
@@ -3,6 +3,8 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_path", "nogo")
 
 # gazelle:prefix source.monogon.dev
+# gazelle:go_naming_convention go_default_library
+# gazelle:go_naming_convention_external go_default_library
 gazelle(name = "gazelle")
 
 fietsje(name = "fietsje")
diff --git a/WORKSPACE b/WORKSPACE
index 485e271..38ad043 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -29,35 +29,33 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
-    # Pin slightly above 0.23.0 (and 0.23.1 prerelease at time of writing) to pull in this commit.
-    # This fixes https://github.com/bazelbuild/rules_go/issues/2499, which started manifesting at 0.22.4.
     name = "io_bazel_rules_go",
-    sha256 = "89501e6e6ae6308e82239f0c8e53dceaa428ad8de471a7f8be8b99a1717bb7d8",
-    strip_prefix = "rules_go-c07100d793fc0cdb20bc4f0361c1d53987ba259b",
+    sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc",
     urls = [
-        "https://github.com/bazelbuild/rules_go/archive/c07100d793fc0cdb20bc4f0361c1d53987ba259b.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
     ],
 )
 
 http_archive(
     name = "bazel_gazelle",
-    patch_args = ["-p1"],
+    sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4",
     patches = [
         "//third_party/gazelle:add-prepatching.patch",
     ],
-    sha256 = "bfd86b3cbe855d6c16c6fce60d76bd51f5c8dbc9cfcaef7a2bb5c1aafd0710e8",
+    patch_args = ["-p1"],
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.0/bazel-gazelle-v0.21.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.0/bazel-gazellev0.21.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
     ],
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
-# golang.org/x/sys is overridden by the go_rules protobuf dependency -> declare it first, since
-# we need a newer version of it for the netlink package which would fail to compile otherwise.
 load("@bazel_gazelle//:deps.bzl", "go_repository")
 
+# golang.org/x/sys is overridden by the go_rules protobuf dependency -> declare it first, since
+# we need a newer version of it for the netlink package which would fail to compile otherwise.
 go_repository(
     name = "org_golang_x_sys",
     importpath = "golang.org/x/sys",
@@ -65,20 +63,6 @@
     version = "v0.0.0-20190927073244-c990c680b611",
 )
 
-# we also pin github.com/golang/protobuf to 1.3.2, because we use gRPC 1.26 (can bump to 1.27
-# once https://github.com/etcd-io/etcd/issues/11563 is resolved and merged.
-
-go_repository(
-    name = "com_github_golang_protobuf",
-    build_file_proto_mode = "disable_global",
-    commit = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7",
-    importpath = "github.com/golang/protobuf",
-    patch_args = ["-p1"],
-    patches = [
-        "@io_bazel_rules_go//third_party:com_github_golang_protobuf-extras.patch",
-    ],
-)
-
 go_rules_dependencies()
 
 go_register_toolchains(
@@ -170,9 +154,9 @@
 
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "14ac30773fdb393ddec90e158c9ec7ebb3f8a4fd533ec2abbfd8789ad81a284b",
-    strip_prefix = "rules_docker-0.12.1",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.1/rules_docker-v0.12.1.tar.gz"],
+    sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80",
+    strip_prefix = "rules_docker-0.15.0",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"],
 )
 
 load(
diff --git a/build/Dockerfile b/build/Dockerfile
index 12065f5..b893eec 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -37,8 +37,8 @@
 
 # Install Bazel binary
 RUN curl -o /usr/local/bin/bazel \
-	https://releases.bazel.build/2.2.0/release/bazel-2.2.0-linux-x86_64 && \
-	echo 'b2f002ea0e6194a181af6ac84cd94bd8dc797722eb2354690bebac92dda233ff  /usr/local/bin/bazel' | sha256sum --check && \
+	https://releases.bazel.build/3.7.2/release/bazel-3.7.2-linux-x86_64 && \
+	echo '70dc0bee198a4c3d332925a32d464d9036a831977501f66d4996854ad4e4fc0d  /usr/local/bin/bazel' | sha256sum --check && \
 	chmod +x /usr/local/bin/bazel
 
 # Use a shared Go module cache for gazelle
diff --git a/build/bindata/bindata.bzl b/build/bindata/bindata.bzl
index 9420329..5903754 100644
--- a/build/bindata/bindata.bzl
+++ b/build/bindata/bindata.bzl
@@ -16,10 +16,6 @@
 
 load("@bazel_gazelle//:deps.bzl", "go_repository")
 load(
-    "@io_bazel_rules_go//go/private:rules/rule.bzl",
-    "go_rule",
-)
-load(
     "@io_bazel_rules_go//go:def.bzl",
     "GoLibrary",
     "go_context",
@@ -63,11 +59,23 @@
 
     return providers + [OutputGroupInfo(**output_groups)]
 
-bindata = go_rule(
-    _bindata_impl,
+bindata = rule(
+    implementation = _bindata_impl,
     attrs = {
-        "srcs": attr.label_list(mandatory = True, allow_files = True),
-        "package": attr.string(mandatory = True),
-        "bindata": attr.label(allow_single_file = True, default = Label("@com_github_kevinburke_go_bindata//go-bindata")),
+        "srcs": attr.label_list(
+            mandatory = True,
+            allow_files = True,
+         ),
+        "package": attr.string(
+            mandatory = True,
+         ),
+        "bindata": attr.label(
+            allow_single_file = True,
+            default = Label("@com_github_kevinburke_go_bindata//go-bindata"),
+        ),
+        "_go_context_data": attr.label(
+            default = "@io_bazel_rules_go//:go_context_data",
+        ),
     },
+    toolchains = ["@io_bazel_rules_go//go:toolchain"],
 )
diff --git a/build/fietsje/def.bzl b/build/fietsje/def.bzl
index 65997f6..f735797 100644
--- a/build/fietsje/def.bzl
+++ b/build/fietsje/def.bzl
@@ -17,7 +17,6 @@
 load(
     "@io_bazel_rules_go//go:def.bzl",
     _go_context = "go_context",
-    _go_rule = "go_rule",
 )
 load(
     "@bazel_skylib//lib:shell.bzl",
@@ -47,7 +46,7 @@
         executable = out_file,
     )]
 
-_fietsje_runner = _go_rule(
+_fietsje_runner = rule(
     implementation = _fietsje_runner_impl,
     attrs = {
         "fietsje": attr.label(
@@ -59,7 +58,11 @@
             default = "//build/fietsje:fietsje.bash.in",
             allow_single_file = True,
         ),
+        "_go_context_data": attr.label(
+            default = "@io_bazel_rules_go//:go_context_data",
+        ),
     },
+    toolchains = ["@io_bazel_rules_go//go:toolchain"],
 )
 
 def fietsje(name):
diff --git a/build/fietsje/dependency.go b/build/fietsje/dependency.go
index 8644bc4..6b75000 100644
--- a/build/fietsje/dependency.go
+++ b/build/fietsje/dependency.go
@@ -117,13 +117,6 @@
 	// And resolve its bazelName.
 	name := label.ImportPathToBazelRepoName(d.importpath)
 
-	// Hack for github.com/google/gvisor: it requests @com_github_opencontainers_runtime-spec.
-	// We fix the generated name for this repo so it conforms to what gvisor expects.
-	// TODO(q3k): instead of this, patch gvisor?
-	if name == "com_github_opencontainers_runtime_spec" {
-		name = "com_github_opencontainers_runtime-spec"
-	}
-
 	d.locked = &locked{
 		bazelName: name,
 		sum:       sum,
diff --git a/build/fietsje/deps_containerd.go b/build/fietsje/deps_containerd.go
index 5172ffe..09db846 100644
--- a/build/fietsje/deps_containerd.go
+++ b/build/fietsje/deps_containerd.go
@@ -18,7 +18,7 @@
 
 func depsContainerd(p *planner) {
 	p.collectOverride(
-		"github.com/containerd/containerd", "v1.4.0-beta.2",
+		"github.com/containerd/containerd", "v1.4.3",
 		buildTags("no_zfs", "no_aufs", "no_devicemapper", "no_btrfs"),
 		disabledProtoBuild,
 	).use(
@@ -35,7 +35,6 @@
 		"github.com/containerd/go-runc",
 		"github.com/containerd/imgcrypt",
 		"github.com/containers/ocicrypt",
-		"github.com/containerd/ttrpc",
 		"github.com/containerd/typeurl",
 		"github.com/containernetworking/cni",
 		"github.com/coreos/go-systemd/v22",
@@ -72,7 +71,6 @@
 		"github.com/prometheus/common",
 		"github.com/prometheus/procfs",
 		"github.com/russross/blackfriday/v2",
-		"github.com/seccomp/libseccomp-golang",
 		"github.com/shurcooL/sanitized_anchor_name",
 		"github.com/sirupsen/logrus",
 		"github.com/syndtr/gocapability",
@@ -83,7 +81,6 @@
 		"golang.org/x/crypto",
 		"golang.org/x/oauth2",
 		"golang.org/x/sync",
-		"golang.org/x/sys",
 		"google.golang.org/genproto",
 		"gopkg.in/inf.v0",
 		"gopkg.in/yaml.v2",
@@ -96,6 +93,37 @@
 		"github.com/gogo/googleapis",
 	).with(buildTags("selinux")).use(
 		"github.com/opencontainers/selinux",
+		"github.com/willf/bitset",
+	).with(patches(
+		"ttrpc-hacks.patch",
+	)).use(
+		"github.com/containerd/ttrpc",
+	).replace(
+		// ttrpc is broken by go protobuf v2, this is a tentative PR that's
+		// not yet merged by upstream.
+		// See: https://github.com/containerd/ttrpc/pull/67
+		//
+		// It also contains our own fix that builds up on the above and allows
+		// services to return the original status error library values. This is
+		// required for ttrpc to actually work from runsc and for results to be
+		// correctly interpreted by containerd.
+		// See: https://github.com/monogon-dev/ttrpc/commit/222b428f008e3ecb11cfff12e3fd92e3143a2f01
+		//
+		// Note: this is not a good fix, and has known issues, like not being
+		// able to return Details in gRPC status errors. However, with the
+		// limited usage within gvisor/containerd it works. In the future
+		// upstream will have to resolve this properly, eg. port ttrpc away
+		// from gogo, or fix gogo to work with the new protobuf APU.
+		"github.com/containerd/ttrpc",
+		"github.com/monogon-dev/ttrpc", "222b428f008e3ecb11cfff12e3fd92e3143a2f01",
+	)
+
+	// This is depended on by github.com/containerd/containerd, but not mentioned in their
+	// vendor.conf. They seem to be moving off of vendoring to gomod, so this should be
+	// reverted on the next containerd bump (when fietsje will panic about vendor.conf
+	// missing).
+	p.collectOverride(
+		"github.com/checkpoint-restore/go-criu/v4", "v4.1.0",
 	)
 
 	// containernetworking/plugins
diff --git a/build/fietsje/deps_gvisor.go b/build/fietsje/deps_gvisor.go
index 1856aa7..3209aa4 100644
--- a/build/fietsje/deps_gvisor.go
+++ b/build/fietsje/deps_gvisor.go
@@ -18,24 +18,20 @@
 
 func depsGVisor(p *planner) {
 	p.collect(
-		"github.com/google/gvisor", "release-20200511.0",
-		patches("gvisor.patch"),
+		"github.com/google/gvisor", "release-20201216.0",
+		patches(
+			"gvisor.patch",
+			"gvisor-build-against-newer-runtime-specs.patch",
+		),
 	).use(
 		"github.com/cenkalti/backoff",
 		"github.com/gofrs/flock",
 		"github.com/google/subcommands",
 		"github.com/kr/pretty",
 		"github.com/kr/pty",
+		"github.com/mohae/deepcopy",
 		"golang.org/x/time",
 	)
 	// gRPC is used by gvisor's bazel machinery, but not present in go.sum. Include it manually.
-	p.collect("github.com/grpc/grpc", "v1.26.0")
-
-	p.collect(
-		"github.com/google/gvisor-containerd-shim", "v0.0.4",
-		patches(
-			"gvisor-containerd-shim.patch", "gvisor-containerd-shim-build.patch",
-			"gvisor-containerd-shim-nogo.patch", "gvisor-shim-root.patch",
-		),
-	)
+	p.collect("github.com/grpc/grpc", "v1.29.1")
 }
diff --git a/build/fietsje/deps_kubernetes.go b/build/fietsje/deps_kubernetes.go
index 3626f68..13b425d 100644
--- a/build/fietsje/deps_kubernetes.go
+++ b/build/fietsje/deps_kubernetes.go
@@ -33,7 +33,7 @@
 		),
 	).inject(
 		// repo infra, not requested by k8s, but used with bazel
-		"k8s.io/repo-infra", "df02ded38f9506e5bbcbf21702034b4fef815f2f",
+		"k8s.io/repo-infra", "a3483874bd37251c629c92df6d82a226b0e6ad92",
 	).with(prePatches("k8s-client-go.patch")).use(
 		"k8s.io/client-go",
 	).with(patches("k8s-native-mounter.patch")).use(
@@ -72,7 +72,6 @@
 		"github.com/bgentry/speakeasy",
 		"github.com/blang/semver",
 		"github.com/chai2010/gettext-go",
-		"github.com/checkpoint-restore/go-criu/v4",
 		"github.com/container-storage-interface/spec",
 		"github.com/coreos/go-oidc",
 		"github.com/coreos/go-semver",
diff --git a/build/fietsje/main.go b/build/fietsje/main.go
index 7be1107..247379a 100644
--- a/build/fietsje/main.go
+++ b/build/fietsje/main.go
@@ -53,10 +53,10 @@
 		shelf: shelf,
 	}
 
-	// gRPC/proto deps (https://github.com/bazelbuild/rules_go/blob/master/go/workspace.rst#id8)
-	// bump down from 1.28.1 to 1.26.0 because https://github.com/etcd-io/etcd/issues/11563
+	// Currently can't bump past v1.30.0, as that removes the old balancer.Picker API that
+	// go-etcd depends upon. See https://github.com/etcd-io/etcd/pull/12398 .
 	p.collect(
-		"google.golang.org/grpc", "v1.26.0",
+		"google.golang.org/grpc", "v1.29.1",
 	).use(
 		"golang.org/x/net",
 		"golang.org/x/text",
diff --git a/build/fietsje/render.go b/build/fietsje/render.go
index 16fd089..3374e8f 100644
--- a/build/fietsje/render.go
+++ b/build/fietsje/render.go
@@ -80,14 +80,13 @@
 		if d.patches != nil || d.prePatches != nil {
 			fmt.Fprintf(w, "        patch_args = [%q],\n", "-p1")
 		}
-		if d.buildExtraArgs != nil {
-			fmt.Fprintf(w, "        build_extra_args = [\n")
-			for _, arg := range d.buildExtraArgs {
-				fmt.Fprintf(w, "            %q,\n", arg)
-			}
-			fmt.Fprintf(w, "        ],\n")
+		fmt.Fprintf(w, "        build_extra_args = [\n")
+		fmt.Fprintf(w, "            %q,\n", "-go_naming_convention=go_default_library")
+		fmt.Fprintf(w, "            %q,\n", "-go_naming_convention_external=go_default_library")
+		for _, arg := range d.buildExtraArgs {
+			fmt.Fprintf(w, "            %q,\n", arg)
 		}
-
+		fmt.Fprintf(w, "        ],\n")
 		fmt.Fprintf(w, "    )\n")
 	}
 	return nil
diff --git a/build/toolchain/BUILD b/build/toolchain/BUILD
index 541f011..bd8c307 100644
--- a/build/toolchain/BUILD
+++ b/build/toolchain/BUILD
@@ -48,8 +48,6 @@
 
 cc_toolchain(
     name = "host_cc_k8_toolchain",
-    toolchain_identifier = "host-k8-toolchain",
-    toolchain_config = ":host_cc_k8_toolchain_config",
     all_files = ":empty",
     compiler_files = ":empty",
     dwp_files = ":empty",
@@ -57,6 +55,8 @@
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 0,
+    toolchain_config = ":host_cc_k8_toolchain_config",
+    toolchain_identifier = "host-k8-toolchain",
 )
 
 host_cc_toolchain_config(name = "host_cc_k8_toolchain_config")
diff --git a/build/toolchain/musl-host-gcc/sysroot/BUILD b/build/toolchain/musl-host-gcc/sysroot/BUILD
index 62260ae..2979ee1 100644
--- a/build/toolchain/musl-host-gcc/sysroot/BUILD
+++ b/build/toolchain/musl-host-gcc/sysroot/BUILD
@@ -18,7 +18,7 @@
 
 musl_gcc_tarball(
     name = "sysroot",
+    linux_headers = ":linux_headers",
     musl = "//third_party/musl",
     musl_headers = ":musl_headers",
-    linux_headers = ":linux_headers",
 )
diff --git a/metropolis/node/BUILD.bazel b/metropolis/node/BUILD.bazel
index 2da33e6..96c075c 100644
--- a/metropolis/node/BUILD.bazel
+++ b/metropolis/node/BUILD.bazel
@@ -38,7 +38,7 @@
 
         # runsc/gVisor
         "@com_github_google_gvisor//runsc": "/containerd/bin/runsc",
-        "@com_github_google_gvisor_containerd_shim//cmd/containerd-shim-runsc-v1": "/containerd/bin/containerd-shim-runsc-v1",
+        "@com_github_google_gvisor//shim/v2:containerd-shim-runsc-v1": "/containerd/bin/containerd-shim-runsc-v1",
 
         # runc (runtime in files_cc because of cgo)
         "@com_github_containerd_containerd//cmd/containerd-shim-runc-v2": "/containerd/bin/containerd-shim-runc-v2",
@@ -88,8 +88,8 @@
         "//metropolis/node/build/mkimage",
     ],
     visibility = [
-        "//metropolis/test/launch:__subpackages__",
         "//metropolis/test/e2e:__subpackages__",
+        "//metropolis/test/launch:__subpackages__",
     ],
 )
 
@@ -131,8 +131,8 @@
     cp tpm/ca/signkey.pem $(location tpm/signkey.pem)
     """,
     visibility = [
-        "//metropolis/test/launch:__subpackages__",
         "//metropolis/test/e2e:__subpackages__",
+        "//metropolis/test/launch:__subpackages__",
     ],
 )
 
diff --git a/metropolis/node/core/consensus/consensus.go b/metropolis/node/core/consensus/consensus.go
index c8fb9b5..f0a2e22 100644
--- a/metropolis/node/core/consensus/consensus.go
+++ b/metropolis/node/core/consensus/consensus.go
@@ -198,7 +198,7 @@
 			return fmt.Errorf("when issuing new cluster's first certificate: %w", err)
 		}
 
-		if err := s.config.Data.PeerPKI.MkdirAll(0600); err != nil {
+		if err := s.config.Data.PeerPKI.MkdirAll(0700); err != nil {
 			return fmt.Errorf("when creating PKI directory: %w", err)
 		}
 		if err := s.config.Data.PeerPKI.CACertificate.Write(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: st.ca.CACertRaw}), 0600); err != nil {
@@ -221,7 +221,7 @@
 		}
 	}
 
-	if err := s.config.Data.MkdirAll(0600); err != nil {
+	if err := s.config.Data.MkdirAll(0700); err != nil {
 		return fmt.Errorf("failed to create data directory; %w", err)
 	}
 
diff --git a/metropolis/node/core/consensus/consensus_test.go b/metropolis/node/core/consensus/consensus_test.go
index f6526c9..5729bc1 100644
--- a/metropolis/node/core/consensus/consensus_test.go
+++ b/metropolis/node/core/consensus/consensus_test.go
@@ -42,7 +42,10 @@
 func prep(t *testing.T) *boilerplate {
 	ctx, ctxC := context.WithCancel(context.Background())
 	root := &localstorage.Root{}
-	tmp, err := ioutil.TempDir("", "metropolis-consensus-test")
+	// Force usage of /tmp as temp directory root, otherwsie TMPDIR from Bazel
+	// returns a path long enough that socket binds in the localstorage fail
+	// (as socket names are limited to 108 characters).
+	tmp, err := ioutil.TempDir("/tmp", "metropolis-consensus-test")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/metropolis/pkg/fsquota/BUILD.bazel b/metropolis/pkg/fsquota/BUILD.bazel
index 58b2a0b..f4e11d3 100644
--- a/metropolis/pkg/fsquota/BUILD.bazel
+++ b/metropolis/pkg/fsquota/BUILD.bazel
@@ -28,12 +28,12 @@
 )
 
 ktest(
+    cmdline = "ramdisk_size=51200",
+    initramfs_extra = """
+file /mkfs.xfs $(location //third_party/xfsprogs:mkfs.xfs) 0755 0 0
+    """,
     tester = ":go_default_test",
     deps = [
         "//third_party/xfsprogs:mkfs.xfs",
     ],
-    initramfs_extra = """
-file /mkfs.xfs $(location //third_party/xfsprogs:mkfs.xfs) 0755 0 0
-    """,
-    cmdline = "ramdisk_size=51200",
 )
diff --git a/metropolis/test/e2e/k8s_cts/BUILD.bazel b/metropolis/test/e2e/k8s_cts/BUILD.bazel
index fc2ab84..afad6bc 100644
--- a/metropolis/test/e2e/k8s_cts/BUILD.bazel
+++ b/metropolis/test/e2e/k8s_cts/BUILD.bazel
@@ -45,8 +45,8 @@
     data = [
         "//metropolis/node:image",
         "//metropolis/node:swtpm_data",
-        "//metropolis/test/nanoswitch:initramfs",
         "//metropolis/test/ktest:linux-testing",
+        "//metropolis/test/nanoswitch:initramfs",
         "//third_party/edk2:firmware",
         "@com_github_bonzini_qboot//:qboot-bin",
     ],
diff --git a/metropolis/test/launch/cli/launch-multi2/BUILD.bazel b/metropolis/test/launch/cli/launch-multi2/BUILD.bazel
index 743dff9..91efdd7 100644
--- a/metropolis/test/launch/cli/launch-multi2/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch-multi2/BUILD.bazel
@@ -20,8 +20,8 @@
     data = [
         "//metropolis/node:image",
         "//metropolis/node:swtpm_data",
-        "//metropolis/test/nanoswitch:initramfs",
         "//metropolis/test/ktest:linux-testing",
+        "//metropolis/test/nanoswitch:initramfs",
         "//third_party/edk2:firmware",
         "@com_github_bonzini_qboot//:qboot-bin",
     ],
diff --git a/nogo_config.json b/nogo_config.json
index 5b26838..c13baaf 100644
--- a/nogo_config.json
+++ b/nogo_config.json
@@ -26,7 +26,8 @@
       "external/io_k8s_apiserver/": "third_party",
       "external/org_golang_google_protobuf/": "third_party",
       "external/com_github_armon_go_metrics/": "third_party",
-      "external/com_github_elazarl_goproxy/": "third_party"
+      "external/com_github_elazarl_goproxy/": "third_party",
+      "external/com_github_googleapis_gnostic/": "third_party"
     }
   },
   "lostcancel": {
@@ -62,7 +63,9 @@
       "sqlite3.*go": "third_party",
       "external/com_github_google_gvisor/": "third_party",
       "external/io_k8s_sigs_structured_merge_diff/": "third_party",
-      "external/com_github_go_delve_delve/": "third_party"
+      "external/com_github_go_delve_delve/": "third_party",
+      "external/com_github_mailru_easyjson/jlexer/": "third_party",
+      "external/com_github_cilium_ebpf/": "third_party"
     }
   },
   "unusedresult": {
diff --git a/third_party/gazelle/add-prepatching.patch b/third_party/gazelle/add-prepatching.patch
index edbc94c..2150e96 100644
--- a/third_party/gazelle/add-prepatching.patch
+++ b/third_party/gazelle/add-prepatching.patch
@@ -13,20 +13,21 @@
 limitations under the License.
 
 
-From db55421f284253c06561a4df18bca262999962ce Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@nexantic.com>
-Date: Wed, 22 Jul 2020 09:46:56 +0200
+From 2cb763552e2e386928e6c2211c4fb056b9ca7971 Mon Sep 17 00:00:00 2001
+From: Serge Bazanski <serge@nexantic.com>
+Date: Thu, 14 Jan 2021 16:30:32 +0100
 Subject: [PATCH] Add support for prepatching
+Company: nexantic GmbH
 
 ---
- internal/go_repository.bzl | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
+ internal/go_repository.bzl | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/internal/go_repository.bzl b/internal/go_repository.bzl
-index 51a7317..86899bd 100644
+index 7f87ed1..a0ef36d 100644
 --- a/internal/go_repository.bzl
 +++ b/internal/go_repository.bzl
-@@ -127,6 +127,8 @@ def _go_repository_impl(ctx):
+@@ -130,6 +130,8 @@ def _go_repository_impl(ctx):
          if result.stderr:
              print("fetch_repo: " + result.stderr)
  
@@ -35,21 +36,8 @@
      # Repositories are fetched. Determine if build file generation is needed.
      build_file_names = ctx.attr.build_file_name.split(",")
      existing_build_file = ""
-@@ -160,7 +162,7 @@ def _go_repository_impl(ctx):
-             "-repo_root",
-             ctx.path(""),
-             "-repo_config",
--            ctx.path(ctx.attr.build_config)
-+            ctx.path(ctx.attr.build_config),
-         ]
-         if ctx.attr.version:
-             cmd.append("-go_repository_module_mode")
-@@ -247,9 +249,13 @@ go_repository = repository_rule(
-             ],
-         ),
-         "build_extra_args": attr.string_list(),
--        "build_config": attr.label(default= "@bazel_gazelle_go_repository_config//:WORKSPACE"),
-+        "build_config": attr.label(default = "@bazel_gazelle_go_repository_config//:WORKSPACE"),
+@@ -263,6 +265,10 @@ go_repository = repository_rule(
+         "build_config": attr.label(default = "@bazel_gazelle_go_repository_config//:WORKSPACE"),
          "build_directives": attr.string_list(default = []),
  
 +        # Patches to apply before running gazelle.
@@ -59,7 +47,7 @@
          # Patches to apply after running gazelle.
          "patches": attr.label_list(),
          "patch_tool": attr.string(default = "patch"),
-@@ -260,10 +266,11 @@ go_repository = repository_rule(
+@@ -273,10 +279,11 @@ go_repository = repository_rule(
  """See repository.rst#go-repository for full documentation."""
  
  # Copied from @bazel_tools//tools/build_defs/repo:utils.bzl
@@ -73,7 +61,7 @@
          command = "{patchtool} {patch_args} < {patchfile}".format(
              patchtool = ctx.attr.patch_tool,
              patchfile = ctx.path(patchfile),
-@@ -276,7 +283,8 @@ def patch(ctx):
+@@ -289,7 +296,8 @@ def patch(ctx):
          if st.return_code:
              fail("Error applying patch %s:\n%s%s" %
                   (str(patchfile), st.stderr, st.stdout))
@@ -84,5 +72,5 @@
          if st.return_code:
              fail("Error applying patch command %s:\n%s%s" %
 -- 
-2.25.1
+2.26.2
 
diff --git a/third_party/go/patches/gvisor-build-against-newer-runtime-specs.patch b/third_party/go/patches/gvisor-build-against-newer-runtime-specs.patch
new file mode 100644
index 0000000..f653492
--- /dev/null
+++ b/third_party/go/patches/gvisor-build-against-newer-runtime-specs.patch
@@ -0,0 +1,41 @@
+Copyright 2020 The Monogon Project 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
+
+  http://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.
+
+
+From 9fc5e36f4e0bd691fc502372ebf837d24fbe5297 Mon Sep 17 00:00:00 2001
+From: Serge Bazanski <serge@nexantic.com>
+Date: Fri, 15 Jan 2021 16:22:33 +0100
+Subject: [PATCH] Build against new opencontainers runtime-specs
+Company: nexantic GmbH
+
+---
+ runsc/container/container.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runsc/container/container.go b/runsc/container/container.go
+index 418a27beb..8508ded5a 100644
+--- a/runsc/container/container.go
++++ b/runsc/container/container.go
+@@ -747,7 +747,7 @@ func (c *Container) State() specs.State {
+ 	return specs.State{
+ 		Version: specs.Version,
+ 		ID:      c.ID,
+-		Status:  c.Status.String(),
++		Status:  specs.ContainerState(c.Status.String()),
+ 		Pid:     c.SandboxPid(),
+ 		Bundle:  c.BundleDir,
+ 	}
+-- 
+2.26.2
+
diff --git a/third_party/go/patches/gvisor-containerd-shim-build.patch b/third_party/go/patches/gvisor-containerd-shim-build.patch
deleted file mode 100644
index 3431f2e..0000000
--- a/third_party/go/patches/gvisor-containerd-shim-build.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Copyright 2020 The Monogon Project 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
-
-  http://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.
-
-
-From d92dc4195d4de5149e7e55890fa856837a35217e Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@brun.one>
-Date: Mon, 4 May 2020 15:33:40 +0200
-Subject: [PATCH] Reflect code patches in Bazel
-
----
- cmd/containerd-shim-runsc-v1/BUILD.bazel |  1 +
- cmd/gvisor-containerd-shim/BUILD.bazel   |  4 ++--
- pkg/v1/proc/BUILD.bazel                  |  3 ++-
- pkg/v1/shim/BUILD.bazel                  |  5 +++--
- pkg/v2/BUILD.bazel                       | 14 ++++++++------
- 5 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/cmd/gvisor-containerd-shim/BUILD.bazel b/cmd/gvisor-containerd-shim/BUILD.bazel
-index 8478746..f6a6fa2 100644
---- a/cmd/gvisor-containerd-shim/BUILD.bazel
-+++ b/cmd/gvisor-containerd-shim/BUILD.bazel
-@@ -14,9 +14,9 @@ go_library(
-         "@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/linux/proc:go_default_library",
--        "@com_github_containerd_containerd//runtime/v1/shim:go_default_library",
-+        "@com_github_containerd_containerd//pkg/process:go_default_library",
-         "@com_github_containerd_containerd//runtime/v1/shim/v1: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",
-diff --git a/pkg/v1/proc/BUILD.bazel b/pkg/v1/proc/BUILD.bazel
-index 8ef457c..1bf9228 100644
---- a/pkg/v1/proc/BUILD.bazel
-+++ b/pkg/v1/proc/BUILD.bazel
-@@ -21,7 +21,8 @@ go_library(
-         "@com_github_containerd_containerd//errdefs:go_default_library",
-         "@com_github_containerd_containerd//log:go_default_library",
-         "@com_github_containerd_containerd//mount:go_default_library",
--        "@com_github_containerd_containerd//runtime/proc:go_default_library",
-+        "@com_github_containerd_containerd//pkg/process:go_default_library",
-+        "@com_github_containerd_containerd//pkg/stdio:go_default_library",
-         "@com_github_containerd_fifo//:go_default_library",
-         "@com_github_containerd_go_runc//:go_default_library",
-         "@com_github_gogo_protobuf//types:go_default_library",
-diff --git a/pkg/v1/shim/BUILD.bazel b/pkg/v1/shim/BUILD.bazel
-index a5d83c4..2129cd8 100644
---- a/pkg/v1/shim/BUILD.bazel
-+++ b/pkg/v1/shim/BUILD.bazel
-@@ -20,11 +20,12 @@ go_library(
-         "@com_github_containerd_containerd//log:go_default_library",
-         "@com_github_containerd_containerd//mount:go_default_library",
-         "@com_github_containerd_containerd//namespaces:go_default_library",
-+        "@com_github_containerd_containerd//pkg/process:go_default_library",
-+        "@com_github_containerd_containerd//pkg/stdio:go_default_library",
-         "@com_github_containerd_containerd//runtime:go_default_library",
-         "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
--        "@com_github_containerd_containerd//runtime/proc:go_default_library",
--        "@com_github_containerd_containerd//runtime/v1/shim:go_default_library",
-         "@com_github_containerd_containerd//runtime/v1/shim/v1:go_default_library",
-+        "@com_github_containerd_containerd//sys/reaper:go_default_library",
-         "@com_github_containerd_fifo//:go_default_library",
-         "@com_github_containerd_typeurl//:go_default_library",
-         "@com_github_gogo_protobuf//types:go_default_library",
-diff --git a/pkg/v2/BUILD.bazel b/pkg/v2/BUILD.bazel
-index a7a6abb..d61b785 100644
---- a/pkg/v2/BUILD.bazel
-+++ b/pkg/v2/BUILD.bazel
-@@ -16,20 +16,21 @@ go_library(
-             "//pkg/v1/utils:go_default_library",
-             "//pkg/v2/options:go_default_library",
-             "@com_github_burntsushi_toml//:go_default_library",
--            "@com_github_containerd_cgroups//:go_default_library",
-+            "@com_github_containerd_cgroups//stats/v1:go_default_library",
-             "@com_github_containerd_console//:go_default_library",
-             "@com_github_containerd_containerd//api/events:go_default_library",
-             "@com_github_containerd_containerd//api/types/task:go_default_library",
-             "@com_github_containerd_containerd//errdefs:go_default_library",
--            "@com_github_containerd_containerd//events:go_default_library",
-             "@com_github_containerd_containerd//log:go_default_library",
-             "@com_github_containerd_containerd//mount:go_default_library",
-             "@com_github_containerd_containerd//namespaces:go_default_library",
-+            "@com_github_containerd_containerd//pkg/process:go_default_library",
-+            "@com_github_containerd_containerd//pkg/stdio:go_default_library",
-             "@com_github_containerd_containerd//runtime:go_default_library",
-             "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
--            "@com_github_containerd_containerd//runtime/proc:go_default_library",
-             "@com_github_containerd_containerd//runtime/v2/shim:go_default_library",
-             "@com_github_containerd_containerd//runtime/v2/task:go_default_library",
-+            "@com_github_containerd_containerd//sys/reaper:go_default_library",
-             "@com_github_containerd_cri//pkg/api/runtimeoptions/v1:go_default_library",
-             "@com_github_containerd_fifo//:go_default_library",
-             "@com_github_containerd_typeurl//:go_default_library",
-@@ -44,20 +45,21 @@ go_library(
-             "//pkg/v1/utils:go_default_library",
-             "//pkg/v2/options:go_default_library",
-             "@com_github_burntsushi_toml//:go_default_library",
--            "@com_github_containerd_cgroups//:go_default_library",
-+            "@com_github_containerd_cgroups//stats/v1:go_default_library",
-             "@com_github_containerd_console//:go_default_library",
-             "@com_github_containerd_containerd//api/events:go_default_library",
-             "@com_github_containerd_containerd//api/types/task:go_default_library",
-             "@com_github_containerd_containerd//errdefs:go_default_library",
--            "@com_github_containerd_containerd//events:go_default_library",
-             "@com_github_containerd_containerd//log:go_default_library",
-             "@com_github_containerd_containerd//mount:go_default_library",
-             "@com_github_containerd_containerd//namespaces:go_default_library",
-+            "@com_github_containerd_containerd//pkg/process:go_default_library",
-+            "@com_github_containerd_containerd//pkg/stdio:go_default_library",
-             "@com_github_containerd_containerd//runtime:go_default_library",
-             "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
--            "@com_github_containerd_containerd//runtime/proc:go_default_library",
-             "@com_github_containerd_containerd//runtime/v2/shim:go_default_library",
-             "@com_github_containerd_containerd//runtime/v2/task:go_default_library",
-+            "@com_github_containerd_containerd//sys/reaper:go_default_library",
-             "@com_github_containerd_cri//pkg/api/runtimeoptions/v1:go_default_library",
-             "@com_github_containerd_fifo//:go_default_library",
-             "@com_github_containerd_typeurl//:go_default_library",
--- 
-2.25.1
-
diff --git a/third_party/go/patches/gvisor-containerd-shim-nogo.patch b/third_party/go/patches/gvisor-containerd-shim-nogo.patch
deleted file mode 100644
index 73da277..0000000
--- a/third_party/go/patches/gvisor-containerd-shim-nogo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Copyright 2020 The Monogon Project 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
-
-  http://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.
-
-
-From d926d6f44be46c7dbc932247c0cd3daf6a34586f Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@brun.one>
-Date: Mon, 4 May 2020 15:16:58 +0200
-Subject: [PATCH] Remove unreachable code
-
-Going upstream as https://github.com/google/gvisor-containerd-shim/pull/59
-
----
- pkg/v1/proc/deleted_state.go | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/pkg/v1/proc/deleted_state.go b/pkg/v1/proc/deleted_state.go
-index 95b4406..b023384 100644
---- a/pkg/v1/proc/deleted_state.go
-+++ b/pkg/v1/proc/deleted_state.go
-@@ -38,12 +38,10 @@ func (s *deletedState) Start(ctx context.Context) error {
- }
- 
- func (s *deletedState) Delete(ctx context.Context) error {
--	return errors.Errorf("cannot delete a deleted process")
- 	return errors.Wrap(errdefs.ErrNotFound, "cannot delete a deleted process")
- }
- 
- func (s *deletedState) Kill(ctx context.Context, sig uint32, all bool) error {
--	return errors.Errorf("cannot kill a deleted process")
- 	return errors.Wrap(errdefs.ErrNotFound, "cannot kill a deleted process")
- }
- 
--- 
-2.25.1
-
diff --git a/third_party/go/patches/gvisor-containerd-shim.patch b/third_party/go/patches/gvisor-containerd-shim.patch
deleted file mode 100644
index 124e1d3..0000000
--- a/third_party/go/patches/gvisor-containerd-shim.patch
+++ /dev/null
@@ -1,895 +0,0 @@
-Copyright 2020 The Monogon Project 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
-
-  http://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.
-
-
-From 0d5bed5d74a0f852a7c61db6f5f2c0a61c9fa84c Mon Sep 17 00:00:00 2001
-From: Ian Lewis <ianlewis@google.com>
-Date: Thu, 16 Apr 2020 02:38:33 -0400
-Subject: [PATCH] Update to containerd 1.3.4
-
----
- cmd/gvisor-containerd-shim/main.go |  15 +--
- go.mod                             |  52 ++++----
- go.sum                             | 208 +++++++++++++++++++++++++++++
- pkg/v1/proc/deleted_state.go       |   4 +-
- pkg/v1/proc/exec.go                |   8 +-
- pkg/v1/proc/init.go                |  21 +--
- pkg/v1/proc/init_state.go          |  10 +-
- pkg/v1/shim/platform.go            |   4 +-
- pkg/v1/shim/service.go             |  13 +-
- pkg/v2/service.go                  |  47 ++++---
- pkg/v2/service_linux.go            |   4 +-
- 11 files changed, 302 insertions(+), 84 deletions(-)
-
-diff --git a/cmd/gvisor-containerd-shim/main.go b/cmd/gvisor-containerd-shim/main.go
-index ea26aa1..a9c6a9f 100644
---- a/cmd/gvisor-containerd-shim/main.go
-+++ b/cmd/gvisor-containerd-shim/main.go
-@@ -36,9 +36,9 @@ import (
- 
- 	"github.com/containerd/containerd/events"
- 	"github.com/containerd/containerd/namespaces"
--	"github.com/containerd/containerd/runtime/v1/linux/proc"
--	containerdshim "github.com/containerd/containerd/runtime/v1/shim"
-+	"github.com/containerd/containerd/pkg/process"
- 	shimapi "github.com/containerd/containerd/runtime/v1/shim/v1"
-+	"github.com/containerd/containerd/sys/reaper"
- 	"github.com/containerd/ttrpc"
- 	"github.com/containerd/typeurl"
- 	ptypes "github.com/gogo/protobuf/types"
-@@ -73,7 +73,7 @@ func init() {
- 	flag.StringVar(&workdirFlag, "workdir", "", "path used to storge large temporary data")
- 	// Containerd default to runc, unless another runtime is explicitly specified.
- 	// We keep the same default to make the default behavior consistent.
--	flag.StringVar(&runtimeRootFlag, "runtime-root", proc.RuncRoot, "root directory for the runtime")
-+	flag.StringVar(&runtimeRootFlag, "runtime-root", process.RuncRoot, "root directory for the runtime")
- 	// currently, the `containerd publish` utility is embedded in the daemon binary.
- 	// The daemon invokes `containerd-shim -containerd-binary ...` with its own os.Executable() path.
- 	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "containerd", "path to containerd binary (used for `containerd publish`)")
-@@ -229,8 +229,7 @@ func setupSignals() (chan os.Signal, error) {
- 	signal.Notify(signals, unix.SIGTERM, unix.SIGINT, unix.SIGCHLD, unix.SIGPIPE)
- 	// make sure runc is setup to use the monitor
- 	// for waiting on processes
--	// TODO(random-liu): Move shim/reaper.go to a separate package.
--	runsc.Monitor = containerdshim.Default
-+	runsc.Monitor = reaper.Default
- 	// set the shim as the subreaper for all orphaned processes created by the container
- 	if err := system.SetSubreaper(1); err != nil {
- 		return nil, err
-@@ -251,7 +250,7 @@ func handleSignals(logger *logrus.Entry, signals chan os.Signal, server *ttrpc.S
- 		case s := <-signals:
- 			switch s {
- 			case unix.SIGCHLD:
--				if err := containerdshim.Reap(); err != nil {
-+				if err := reaper.Reap(); err != nil {
- 					logger.WithError(err).Error("reap exit status")
- 				}
- 			case unix.SIGTERM, unix.SIGINT:
-@@ -305,11 +304,11 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
- 	}
- 	cmd := exec.CommandContext(ctx, containerdBinaryFlag, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
- 	cmd.Stdin = bytes.NewReader(data)
--	c, err := containerdshim.Default.Start(cmd)
-+	c, err := reaper.Default.Start(cmd)
- 	if err != nil {
- 		return err
- 	}
--	status, err := containerdshim.Default.Wait(cmd, c)
-+	status, err := reaper.Default.Wait(cmd, c)
- 	if err != nil {
- 		return err
- 	}
-diff --git a/go.mod b/go.mod
-index f15f829..5ae0d2e 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,35 +1,37 @@
- module github.com/google/gvisor-containerd-shim
- 
--go 1.12
-+go 1.14
- 
- require (
--	github.com/BurntSushi/toml v0.3.0
--	github.com/Microsoft/go-winio v0.4.14 // indirect
--	github.com/Microsoft/hcsshim v0.8.6 // indirect
--	github.com/containerd/cgroups v0.0.0-20190328223300-4994991857f9
-+	github.com/BurntSushi/toml v0.3.1
-+	github.com/Microsoft/hcsshim v0.8.7 // indirect
-+	github.com/containerd/cgroups v0.0.0-20200407151229-7fc7a507c04c
- 	github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1
--	github.com/containerd/containerd v0.0.0-20190510190154-d0319ec44af6
--	github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02 // indirect
-+	github.com/containerd/containerd v1.3.4
-+	github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
- 	github.com/containerd/cri v0.0.0-20190308093238-8a0bd84b9a4c
--	github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260
-+	github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b
- 	github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3
--	github.com/containerd/ttrpc v0.0.0-20190411181408-699c4e40d1e7
--	github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd
--	github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b // indirect
--	github.com/docker/go-units v0.3.1 // indirect
--	github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 // indirect
--	github.com/gogo/protobuf v1.0.0
--	github.com/golang/protobuf v1.1.0 // indirect
--	github.com/google/go-cmp v0.3.1 // indirect
--	github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2 // indirect
-+	github.com/containerd/ttrpc v1.0.0
-+	github.com/containerd/typeurl v1.0.0
-+	github.com/docker/distribution v2.7.1+incompatible // indirect
-+	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
-+	github.com/gogo/googleapis v1.3.2 // indirect
-+	github.com/gogo/protobuf v1.3.1
-+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-+	github.com/golang/protobuf v1.4.0 // indirect
-+	github.com/hashicorp/golang-lru v0.5.4 // indirect
-+	github.com/opencontainers/image-spec v1.0.1 // indirect
- 	github.com/opencontainers/runc v1.0.0-rc8
--	github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470
--	github.com/pkg/errors v0.8.1
--	github.com/sirupsen/logrus v1.4.1
--	golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7 // indirect
--	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
--	golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b
--	google.golang.org/genproto v0.0.0-20170523043604-d80a6e20e776 // indirect
--	google.golang.org/grpc v1.12.0
-+	github.com/opencontainers/runtime-spec v1.0.2
-+	github.com/pkg/errors v0.9.1
-+	github.com/sirupsen/logrus v1.5.0
-+	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
-+	go.opencensus.io v0.22.3 // indirect
-+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
-+	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
-+	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4
-+	google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 // indirect
-+	google.golang.org/grpc v1.28.1
- 	gotest.tools v2.2.0+incompatible // indirect
- )
-diff --git a/go.sum b/go.sum
-index 93f2f1d..2fa699d 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1,67 +1,275 @@
-+bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
-+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
- github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY=
- github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
- github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
- github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
-+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA=
-+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
- github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
- github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
-+github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg=
-+github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
-+github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-+github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
-+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
- github.com/containerd/cgroups v0.0.0-20190328223300-4994991857f9 h1:LmZz7ns2YaWWJ6m17esVvIMNOfKcw+f/sCneqxKawB4=
- github.com/containerd/cgroups v0.0.0-20190328223300-4994991857f9/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI=
-+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s=
-+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
-+github.com/containerd/cgroups v0.0.0-20200407151229-7fc7a507c04c h1:BRbZO594sFDSfkqApcikeNRjePj+rJNoh4waZgefcEE=
-+github.com/containerd/cgroups v0.0.0-20200407151229-7fc7a507c04c/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
- github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1 h1:uict5mhHFTzKLUCufdSLym7z/J0CbBJT59lYbP9wtbg=
- github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
- github.com/containerd/containerd v0.0.0-20190510190154-d0319ec44af6 h1:BmZa1bGjKctYrIbyjbhZJlGvHceJASpdW5pIDSQcw1E=
- github.com/containerd/containerd v0.0.0-20190510190154-d0319ec44af6/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-+github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-+github.com/containerd/containerd v1.3.4 h1:3o0smo5SKY7H6AJCmJhsnCjR2/V2T8VmiHt7seN2/kI=
-+github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
- github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02 h1:tN9D97v5A5QuKdcKHKt+UMKrkQ5YXUnD8iM7IAAjEfI=
- github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-+github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk=
-+github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY=
- github.com/containerd/cri v0.0.0-20190308093238-8a0bd84b9a4c h1:+bW7GQb2q32/Liy0ZiR6pkpRXdDHShUXRoWg8OGVWZs=
- github.com/containerd/cri v0.0.0-20190308093238-8a0bd84b9a4c/go.mod h1:DavH5Qa8+6jOmeOMO3dhWoqksucZDe06LfuhBz/xPZs=
- github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260 h1:XGyg7oTtD0DoRFhbpV6x1WfV0flKC4UxXU7ab1zC08U=
- github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
-+github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
-+github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b h1:qUtCegLdOUVfVJOw+KDg6eJyE1TGvLlkGEd1091kSSQ=
-+github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
- github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 h1:esQOJREg8nw8aXj6uCN5dfW5cKUBiEJ/+nni1Q/D/sw=
- github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
- github.com/containerd/ttrpc v0.0.0-20190411181408-699c4e40d1e7 h1:SKDlsIhYxNE1LO0xwuOR+3QWj3zRibVQu5jWIMQmOfU=
- github.com/containerd/ttrpc v0.0.0-20190411181408-699c4e40d1e7/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
-+github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
-+github.com/containerd/ttrpc v1.0.0 h1:NY8Zk2i7TpkLxrkOASo+KTFq9iNCEmMH2/ZG9OuOw6k=
-+github.com/containerd/ttrpc v1.0.0/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
- github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y=
- github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
-+github.com/containerd/typeurl v1.0.0 h1:7LMH7LfEmpWeCkGcIputvd4P0Rnd0LrIv1Jk2s5oobs=
-+github.com/containerd/typeurl v1.0.0/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
- github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b h1:+mtZ0WjVZwTX0RVrXMXDwuYVaNeHGvWBW1UwJeMR+2M=
- github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
-+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-+github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
-+github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
-+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
- github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
- github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
-+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
-+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
- github.com/docker/go-units v0.3.1 h1:QAFdsA6jLCnglbqE6mUsHuPcJlntY94DkxHf4deHKIU=
- github.com/docker/go-units v0.3.1/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
-+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
- github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI=
- github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8=
-+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
-+github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
-+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-+github.com/gogo/googleapis v1.3.2 h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c=
-+github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
- github.com/gogo/protobuf v1.0.0 h1:2jyBKDKU/8v3v2xVR2PtiWQviFUyiaGk2rpfyFT8rTM=
- github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I=
-+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
-+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
- github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc=
- github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-+github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
-+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
- github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
- github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4=
-+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-+github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874 h1:cAv7ZbSmyb1wjn6T4TIiyFCkpcfgpbcNNC3bM2srLaI=
-+github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
-+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
-+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
- github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
- github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
-+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
- github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2 h1:QhPf3A2AZW3tTGvHPg0TA+CR3oHbVLlXUhlghqISp1I=
- github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-+github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
-+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
-+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-+github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
- github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0=
- github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
- github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470 h1:dQgS6CgSB2mBQur4Cz7kaEtXNSw56ZlRb7ZsBT70hTA=
- github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-+github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-+github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
-+github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-+github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-+github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
- github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-+github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
- github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
- github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-+github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
-+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
-+github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-+github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
- github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-+github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-+github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=
-+github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-+github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-+github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-+github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
-+go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
-+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
-+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-+golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
- golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7 h1:FCqk7JXVeupwwnGVopQCC0a0xRK0Rj7SL5AyjjWo4pk=
- golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
-+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
- golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
-+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
- golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
-+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
- google.golang.org/genproto v0.0.0-20170523043604-d80a6e20e776 h1:wVJP1pATLVPNxCz4R2mTO6HUJgfGE0PmIu2E10RuhCw=
- google.golang.org/genproto v0.0.0-20170523043604-d80a6e20e776/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-+google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 h1:j7CmVRD4Kec0+f8VuBAc2Ak2MFfXm5Q2/RxuJLL+76E=
-+google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
- google.golang.org/grpc v1.12.0 h1:Mm8atZtkT+P6R43n/dqNDWkPPu5BwRVu/1rJnJCeZH8=
- google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-+google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
-+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-+google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
-+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
-+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
- gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
- gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
-diff --git a/pkg/v1/proc/deleted_state.go b/pkg/v1/proc/deleted_state.go
-index 95b4406..941598b 100644
---- a/pkg/v1/proc/deleted_state.go
-+++ b/pkg/v1/proc/deleted_state.go
-@@ -22,7 +22,7 @@ import (
- 
- 	"github.com/containerd/console"
- 	"github.com/containerd/containerd/errdefs"
--	"github.com/containerd/containerd/runtime/proc"
-+	"github.com/containerd/containerd/pkg/process"
- 	"github.com/pkg/errors"
- )
- 
-@@ -51,6 +51,6 @@ func (s *deletedState) SetExited(status int) {
- 	// no op
- }
- 
--func (s *deletedState) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (s *deletedState) Exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	return nil, errors.Errorf("cannot exec in a deleted state")
- }
-diff --git a/pkg/v1/proc/exec.go b/pkg/v1/proc/exec.go
-index f02b73b..cbc0819 100644
---- a/pkg/v1/proc/exec.go
-+++ b/pkg/v1/proc/exec.go
-@@ -29,7 +29,7 @@ import (
- 
- 	"github.com/containerd/console"
- 	"github.com/containerd/containerd/errdefs"
--	"github.com/containerd/containerd/runtime/proc"
-+	"github.com/containerd/containerd/pkg/stdio"
- 	"github.com/containerd/fifo"
- 	runc "github.com/containerd/go-runc"
- 	specs "github.com/opencontainers/runtime-spec/specs-go"
-@@ -54,7 +54,7 @@ type execProcess struct {
- 	internalPid int
- 	closers     []io.Closer
- 	stdin       io.Closer
--	stdio       proc.Stdio
-+	stdio       stdio.Stdio
- 	path        string
- 	spec        specs.Process
- 
-@@ -165,7 +165,7 @@ func (e *execProcess) Stdin() io.Closer {
- 	return e.stdin
- }
- 
--func (e *execProcess) Stdio() proc.Stdio {
-+func (e *execProcess) Stdio() stdio.Stdio {
- 	return e.stdio
- }
- 
-@@ -232,7 +232,7 @@ func (e *execProcess) start(ctx context.Context) (err error) {
- 		if err != nil {
- 			return errors.Wrap(err, "failed to retrieve console master")
- 		}
--		if e.console, err = e.parent.Platform.CopyConsole(ctx, console, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
-+		if e.console, err = e.parent.Platform.CopyConsole(ctx, console, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg); err != nil {
- 			return errors.Wrap(err, "failed to start console copy")
- 		}
- 	} else if !e.stdio.IsNull() {
-diff --git a/pkg/v1/proc/init.go b/pkg/v1/proc/init.go
-index 5dbb1da..138880b 100644
---- a/pkg/v1/proc/init.go
-+++ b/pkg/v1/proc/init.go
-@@ -31,7 +31,8 @@ import (
- 	"github.com/containerd/containerd/errdefs"
- 	"github.com/containerd/containerd/log"
- 	"github.com/containerd/containerd/mount"
--	"github.com/containerd/containerd/runtime/proc"
-+	"github.com/containerd/containerd/pkg/process"
-+	"github.com/containerd/containerd/pkg/stdio"
- 	"github.com/containerd/fifo"
- 	runc "github.com/containerd/go-runc"
- 	specs "github.com/opencontainers/runtime-spec/specs-go"
-@@ -61,7 +62,7 @@ type Init struct {
- 	id       string
- 	Bundle   string
- 	console  console.Console
--	Platform proc.Platform
-+	Platform stdio.Platform
- 	io       runc.IO
- 	runtime  *runsc.Runsc
- 	status   int
-@@ -69,7 +70,7 @@ type Init struct {
- 	pid      int
- 	closers  []io.Closer
- 	stdin    io.Closer
--	stdio    proc.Stdio
-+	stdio    stdio.Stdio
- 	Rootfs   string
- 	IoUID    int
- 	IoGID    int
-@@ -94,7 +95,7 @@ func NewRunsc(root, path, namespace, runtime string, config map[string]string) *
- }
- 
- // New returns a new init process
--func New(id string, runtime *runsc.Runsc, stdio proc.Stdio) *Init {
-+func New(id string, runtime *runsc.Runsc, stdio stdio.Stdio) *Init {
- 	p := &Init{
- 		id:        id,
- 		runtime:   runtime,
-@@ -154,7 +155,7 @@ func (p *Init) Create(ctx context.Context, r *CreateConfig) (err error) {
- 		if err != nil {
- 			return errors.Wrap(err, "failed to retrieve console master")
- 		}
--		console, err = p.Platform.CopyConsole(ctx, console, r.Stdin, r.Stdout, r.Stderr, &p.wg, &copyWaitGroup)
-+		console, err = p.Platform.CopyConsole(ctx, console, r.Stdin, r.Stdout, r.Stderr, &p.wg)
- 		if err != nil {
- 			return errors.Wrap(err, "failed to start console copy")
- 		}
-@@ -393,7 +394,7 @@ func (p *Init) Runtime() *runsc.Runsc {
- }
- 
- // Exec returns a new child process
--func (p *Init) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (p *Init) Exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	p.mu.Lock()
- 	defer p.mu.Unlock()
- 
-@@ -401,7 +402,7 @@ func (p *Init) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Proce
- }
- 
- // exec returns a new exec'd process
--func (p *Init) exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (p *Init) exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	// process exec request
- 	var spec specs.Process
- 	if err := json.Unmarshal(r.Spec.Value, &spec); err != nil {
-@@ -414,7 +415,7 @@ func (p *Init) exec(ctx context.Context, path string, r *ExecConfig) (proc.Proce
- 		path:   path,
- 		parent: p,
- 		spec:   spec,
--		stdio: proc.Stdio{
-+		stdio: stdio.Stdio{
- 			Stdin:    r.Stdin,
- 			Stdout:   r.Stdout,
- 			Stderr:   r.Stderr,
-@@ -427,7 +428,7 @@ func (p *Init) exec(ctx context.Context, path string, r *ExecConfig) (proc.Proce
- }
- 
- // Stdio of the process
--func (p *Init) Stdio() proc.Stdio {
-+func (p *Init) Stdio() stdio.Stdio {
- 	return p.stdio
- }
- 
-@@ -455,7 +456,7 @@ func (p *Init) convertStatus(status string) string {
- 	return status
- }
- 
--func withConditionalIO(c proc.Stdio) runc.IOOpt {
-+func withConditionalIO(c stdio.Stdio) runc.IOOpt {
- 	return func(o *runc.IOOption) {
- 		o.OpenStdin = c.Stdin != ""
- 		o.OpenStdout = c.Stdout != ""
-diff --git a/pkg/v1/proc/init_state.go b/pkg/v1/proc/init_state.go
-index f56f6fe..22cca4a 100644
---- a/pkg/v1/proc/init_state.go
-+++ b/pkg/v1/proc/init_state.go
-@@ -22,7 +22,7 @@ import (
- 
- 	"github.com/containerd/console"
- 	"github.com/containerd/containerd/errdefs"
--	"github.com/containerd/containerd/runtime/proc"
-+	"github.com/containerd/containerd/pkg/process"
- 	"github.com/pkg/errors"
- )
- 
-@@ -30,7 +30,7 @@ type initState interface {
- 	Resize(console.WinSize) error
- 	Start(context.Context) error
- 	Delete(context.Context) error
--	Exec(context.Context, string, *ExecConfig) (proc.Process, error)
-+	Exec(context.Context, string, *ExecConfig) (process.Process, error)
- 	Kill(context.Context, uint32, bool) error
- 	SetExited(int)
- }
-@@ -96,7 +96,7 @@ func (s *createdState) SetExited(status int) {
- 	}
- }
- 
--func (s *createdState) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (s *createdState) Exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	return s.p.exec(ctx, path, r)
- }
- 
-@@ -138,7 +138,7 @@ func (s *runningState) SetExited(status int) {
- 	}
- }
- 
--func (s *runningState) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (s *runningState) Exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	return s.p.exec(ctx, path, r)
- }
- 
-@@ -179,6 +179,6 @@ func (s *stoppedState) SetExited(status int) {
- 	// no op
- }
- 
--func (s *stoppedState) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
-+func (s *stoppedState) Exec(ctx context.Context, path string, r *ExecConfig) (process.Process, error) {
- 	return nil, errors.Errorf("cannot exec in a stopped state")
- }
-diff --git a/pkg/v1/shim/platform.go b/pkg/v1/shim/platform.go
-index 10c5495..fa3dd97 100644
---- a/pkg/v1/shim/platform.go
-+++ b/pkg/v1/shim/platform.go
-@@ -32,7 +32,8 @@ type linuxPlatform struct {
- 	epoller *console.Epoller
- }
- 
--func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg, cwg *sync.WaitGroup) (console.Console, error) {
-+func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg *sync.WaitGroup) (console.Console, error) {
-+	var cwg sync.WaitGroup
- 	if p.epoller == nil {
- 		return nil, errors.New("uninitialized epoller")
- 	}
-@@ -76,6 +77,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
- 		outw.Close()
- 		wg.Done()
- 	}()
-+	cwg.Wait()
- 	return epollConsole, nil
- }
- 
-diff --git a/pkg/v1/shim/service.go b/pkg/v1/shim/service.go
-index e06a556..270d190 100644
---- a/pkg/v1/shim/service.go
-+++ b/pkg/v1/shim/service.go
-@@ -32,11 +32,12 @@ import (
- 	"github.com/containerd/containerd/log"
- 	"github.com/containerd/containerd/mount"
- 	"github.com/containerd/containerd/namespaces"
-+	rproc "github.com/containerd/containerd/pkg/process"
-+	"github.com/containerd/containerd/pkg/stdio"
- 	"github.com/containerd/containerd/runtime"
- 	"github.com/containerd/containerd/runtime/linux/runctypes"
--	rproc "github.com/containerd/containerd/runtime/proc"
--	"github.com/containerd/containerd/runtime/v1/shim"
- 	shimapi "github.com/containerd/containerd/runtime/v1/shim/v1"
-+	"github.com/containerd/containerd/sys/reaper"
- 	"github.com/containerd/typeurl"
- 	ptypes "github.com/gogo/protobuf/types"
- 	"github.com/pkg/errors"
-@@ -102,7 +103,7 @@ type Service struct {
- 	context   context.Context
- 	processes map[string]rproc.Process
- 	events    chan interface{}
--	platform  rproc.Platform
-+	platform  stdio.Platform
- 	ec        chan proc.Exit
- 
- 	// Filled by Create()
-@@ -541,7 +542,7 @@ func getTopic(ctx context.Context, e interface{}) string {
- 	return runtime.TaskUnknownTopic
- }
- 
--func newInit(ctx context.Context, path, workDir, runtimeRoot, namespace string, config map[string]string, platform rproc.Platform, r *proc.CreateConfig) (*proc.Init, error) {
-+func newInit(ctx context.Context, path, workDir, runtimeRoot, namespace string, config map[string]string, platform stdio.Platform, r *proc.CreateConfig) (*proc.Init, error) {
- 	var options runctypes.CreateOptions
- 	if r.Options != nil {
- 		v, err := typeurl.UnmarshalAny(r.Options)
-@@ -562,7 +563,7 @@ func newInit(ctx context.Context, path, workDir, runtimeRoot, namespace string,
- 	runsc.FormatLogPath(r.ID, config)
- 	rootfs := filepath.Join(path, "rootfs")
- 	runtime := proc.NewRunsc(runtimeRoot, path, namespace, r.Runtime, config)
--	p := proc.New(r.ID, runtime, rproc.Stdio{
-+	p := proc.New(r.ID, runtime, stdio.Stdio{
- 		Stdin:    r.Stdin,
- 		Stdout:   r.Stdout,
- 		Stderr:   r.Stderr,
-@@ -576,6 +577,6 @@ func newInit(ctx context.Context, path, workDir, runtimeRoot, namespace string,
- 	p.IoGID = int(options.IoGid)
- 	p.Sandbox = utils.IsSandbox(spec)
- 	p.UserLog = utils.UserLogPath(spec)
--	p.Monitor = shim.Default
-+	p.Monitor = reaper.Default
- 	return p, nil
- }
-diff --git a/pkg/v2/service.go b/pkg/v2/service.go
-index 3f0a236..c1df4b8 100644
---- a/pkg/v2/service.go
-+++ b/pkg/v2/service.go
-@@ -30,20 +30,21 @@ import (
- 	"time"
- 
- 	"github.com/BurntSushi/toml"
--	"github.com/containerd/cgroups"
-+	cgroups "github.com/containerd/cgroups/stats/v1"
- 	"github.com/containerd/console"
- 	eventstypes "github.com/containerd/containerd/api/events"
- 	"github.com/containerd/containerd/api/types/task"
- 	"github.com/containerd/containerd/errdefs"
--	"github.com/containerd/containerd/events"
- 	"github.com/containerd/containerd/log"
- 	"github.com/containerd/containerd/mount"
- 	"github.com/containerd/containerd/namespaces"
-+	"github.com/containerd/containerd/pkg/process"
-+	"github.com/containerd/containerd/pkg/stdio"
- 	"github.com/containerd/containerd/runtime"
- 	"github.com/containerd/containerd/runtime/linux/runctypes"
--	rproc "github.com/containerd/containerd/runtime/proc"
- 	"github.com/containerd/containerd/runtime/v2/shim"
- 	taskAPI "github.com/containerd/containerd/runtime/v2/task"
-+	"github.com/containerd/containerd/sys/reaper"
- 	runtimeoptions "github.com/containerd/cri/pkg/api/runtimeoptions/v1"
- 	"github.com/containerd/typeurl"
- 	ptypes "github.com/gogo/protobuf/types"
-@@ -74,23 +75,22 @@ var _ = (taskAPI.TaskService)(&service{})
- const configFile = "config.toml"
- 
- // New returns a new shim service that can be used via GRPC
--func New(ctx context.Context, id string, publisher events.Publisher) (shim.Shim, error) {
--	ctx, cancel := context.WithCancel(ctx)
-+func New(ctx context.Context, id string, publisher shim.Publisher, shutdown func()) (shim.Shim, error) {
- 	s := &service{
- 		id:        id,
- 		context:   ctx,
--		processes: make(map[string]rproc.Process),
-+		processes: make(map[string]process.Process),
- 		events:    make(chan interface{}, 128),
- 		ec:        proc.ExitCh,
--		cancel:    cancel,
-+		cancel:    shutdown,
- 	}
- 	go s.processExits()
--	runsc.Monitor = shim.Default
-+	runsc.Monitor = reaper.Default
- 	if err := s.initPlatform(); err != nil {
--		cancel()
-+		shutdown()
- 		return nil, errors.Wrap(err, "failed to initialized platform behavior")
- 	}
--	go s.forward(publisher)
-+	go s.forward(ctx, publisher)
- 	return s, nil
- }
- 
-@@ -99,10 +99,10 @@ type service struct {
- 	mu sync.Mutex
- 
- 	context   context.Context
--	task      rproc.Process
--	processes map[string]rproc.Process
-+	task      process.Process
-+	processes map[string]process.Process
- 	events    chan interface{}
--	platform  rproc.Platform
-+	platform  stdio.Platform
- 	ec        chan proc.Exit
- 
- 	id     string
-@@ -137,7 +137,7 @@ func newCommand(ctx context.Context, containerdBinary, containerdAddress string)
- 	return cmd, nil
- }
- 
--func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress string) (string, error) {
-+func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (string, error) {
- 	cmd, err := newCommand(ctx, containerdBinary, containerdAddress)
- 	if err != nil {
- 		return "", err
-@@ -560,7 +560,7 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (*task
- 
- func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*ptypes.Empty, error) {
- 	s.cancel()
--	os.Exit(0)
-+	close(s.events)
- 	return empty, nil
- }
- 
-@@ -697,7 +697,7 @@ func (s *service) checkProcesses(e proc.Exit) {
- 	}
- }
- 
--func (s *service) allProcesses() (o []rproc.Process) {
-+func (s *service) allProcesses() (o []process.Process) {
- 	s.mu.Lock()
- 	defer s.mu.Unlock()
- 	for _, p := range s.processes {
-@@ -727,18 +727,21 @@ func (s *service) getContainerPids(ctx context.Context, id string) ([]uint32, er
- 	return pids, nil
- }
- 
--func (s *service) forward(publisher events.Publisher) {
-+func (s *service) forward(ctx context.Context, publisher shim.Publisher) {
-+	ns, _ := namespaces.Namespace(ctx)
-+	ctx = namespaces.WithNamespace(context.Background(), ns)
- 	for e := range s.events {
--		ctx, cancel := context.WithTimeout(s.context, 5*time.Second)
-+		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
- 		err := publisher.Publish(ctx, getTopic(e), e)
- 		cancel()
- 		if err != nil {
- 			logrus.WithError(err).Error("post event")
- 		}
- 	}
-+	publisher.Close()
- }
- 
--func (s *service) getProcess(execID string) (rproc.Process, error) {
-+func (s *service) getProcess(execID string) (process.Process, error) {
- 	s.mu.Lock()
- 	defer s.mu.Unlock()
- 	if execID == "" {
-@@ -773,7 +776,7 @@ func getTopic(e interface{}) string {
- 	return runtime.TaskUnknownTopic
- }
- 
--func newInit(ctx context.Context, path, workDir, namespace string, platform rproc.Platform, r *proc.CreateConfig, options *options.Options, rootfs string) (*proc.Init, error) {
-+func newInit(ctx context.Context, path, workDir, namespace string, platform stdio.Platform, r *proc.CreateConfig, options *options.Options, rootfs string) (*proc.Init, error) {
- 	spec, err := utils.ReadSpec(r.Bundle)
- 	if err != nil {
- 		return nil, errors.Wrap(err, "read oci spec")
-@@ -783,7 +786,7 @@ func newInit(ctx context.Context, path, workDir, namespace string, platform rpro
- 	}
- 	runsc.FormatLogPath(r.ID, options.RunscConfig)
- 	runtime := proc.NewRunsc(options.Root, path, namespace, options.BinaryName, options.RunscConfig)
--	p := proc.New(r.ID, runtime, rproc.Stdio{
-+	p := proc.New(r.ID, runtime, stdio.Stdio{
- 		Stdin:    r.Stdin,
- 		Stdout:   r.Stdout,
- 		Stderr:   r.Stderr,
-@@ -797,6 +800,6 @@ func newInit(ctx context.Context, path, workDir, namespace string, platform rpro
- 	p.IoGID = int(options.IoGid)
- 	p.Sandbox = utils.IsSandbox(spec)
- 	p.UserLog = utils.UserLogPath(spec)
--	p.Monitor = shim.Default
-+	p.Monitor = reaper.Default
- 	return p, nil
- }
-diff --git a/pkg/v2/service_linux.go b/pkg/v2/service_linux.go
-index cbd4315..09d9786 100644
---- a/pkg/v2/service_linux.go
-+++ b/pkg/v2/service_linux.go
-@@ -31,7 +31,8 @@ type linuxPlatform struct {
- 	epoller *console.Epoller
- }
- 
--func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg, cwg *sync.WaitGroup) (console.Console, error) {
-+func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg *sync.WaitGroup) (console.Console, error) {
-+	var cwg sync.WaitGroup
- 	if p.epoller == nil {
- 		return nil, errors.New("uninitialized epoller")
- 	}
-@@ -75,6 +76,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
- 		outw.Close()
- 		wg.Done()
- 	}()
-+	cwg.Wait()
- 	return epollConsole, nil
- }
- 
--- 
-2.25.1
-
diff --git a/third_party/go/patches/k8s-client-go-build.patch b/third_party/go/patches/k8s-client-go-build.patch
deleted file mode 100644
index d5fad50..0000000
--- a/third_party/go/patches/k8s-client-go-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright 2020 The Monogon Project 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
-
-  http://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.
-
-
-This patch updates BUILD files to reflect changes in Go sources. This only needs to be applied because Gazelle applies patches after BUILDfile generation.
-
-diff -ur io_k8s_client_go.orig/plugin/pkg/client/auth/BUILD.bazel io_k8s_client_go/plugin/pkg/client/auth/BUILD.bazel
---- io_k8s_client_go.orig/plugin/pkg/client/auth/BUILD.bazel 17:54:23.086143468 +0200
-+++ io_k8s_client_go/plugin/pkg/client/auth/BUILD.bazel 17:56:17.098546899 +0200
-@@ -6,9 +6,7 @@
-     importpath = "k8s.io/client-go/plugin/pkg/client/auth",
-     visibility = ["//visibility:public"],
-     deps = [
--        "//plugin/pkg/client/auth/azure:go_default_library",
-         "//plugin/pkg/client/auth/gcp:go_default_library",
-         "//plugin/pkg/client/auth/oidc:go_default_library",
--        "//plugin/pkg/client/auth/openstack:go_default_library",
-     ],
- )
diff --git a/third_party/go/repositories.bzl b/third_party/go/repositories.bzl
index 785e090..92fd615 100644
--- a/third_party/go/repositories.bzl
+++ b/third_party/go/repositories.bzl
@@ -22,145 +22,241 @@
         importpath = "cloud.google.com/go",
         version = "v0.51.0",
         sum = "h1:PvKAVQWCtlGUSlZkGW3QLelKaWq7KYv/MW1EboG8bfM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_azure_go_ansiterm",
         importpath = "github.com/Azure/go-ansiterm",
         version = "v0.0.0-20170929234023-d6e3b3328b78",
         sum = "h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_burntsushi_toml",
         importpath = "github.com/BurntSushi/toml",
         version = "v0.3.1",
         sum = "h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_makenowjust_heredoc",
         importpath = "github.com/MakeNowJust/heredoc",
         version = "v0.0.0-20170808103936-bb23615498cd",
         sum = "h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_microsoft_go_winio",
         importpath = "github.com/Microsoft/go-winio",
         version = "v0.4.14",
         sum = "h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_microsoft_hcsshim",
         importpath = "github.com/Microsoft/hcsshim",
-        version = "v0.8.9",
-        sum = "h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk=",
+        version = "v0.8.10",
+        sum = "h1:k5wTrpnVU2/xv8ZuzGkbXVd3js5zJ8RnumPo5RxiIxU=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_nytimes_gziphandler",
         importpath = "github.com/NYTimes/gziphandler",
         version = "v0.0.0-20170623195520-56545f4a5d46",
         sum = "h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_puerkitobio_purell",
         importpath = "github.com/PuerkitoBio/purell",
         version = "v1.1.1",
         sum = "h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_puerkitobio_urlesc",
         importpath = "github.com/PuerkitoBio/urlesc",
         version = "v0.0.0-20170810143723-de5bf2ad4578",
         sum = "h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_alexflint_go_filemutex",
         importpath = "github.com/alexflint/go-filemutex",
         version = "v0.0.0-20171022225611-72bdc8eae2ae",
         sum = "h1:AMzIhMUqU3jMrZiTuW0zkYeKlKDAFD+DG20IoO421/Y=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_armon_circbuf",
         importpath = "github.com/armon/circbuf",
         version = "v0.0.0-20150827004946-bbbad097214e",
         sum = "h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_asaskevich_govalidator",
         importpath = "github.com/asaskevich/govalidator",
         version = "v0.0.0-20190424111038-f61b66f89f4a",
         sum = "h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_beorn7_perks",
         importpath = "github.com/beorn7/perks",
         version = "v1.0.1",
         sum = "h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_bgentry_speakeasy",
         importpath = "github.com/bgentry/speakeasy",
         version = "v0.1.0",
         sum = "h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_blang_semver",
         importpath = "github.com/blang/semver",
         version = "v3.5.0+incompatible",
         sum = "h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_caddyserver_caddy",
         importpath = "github.com/caddyserver/caddy",
         version = "v1.0.5",
         sum = "h1:5B1Hs0UF2x2tggr2X9jL2qOZtDXbIWQb9YLbmlxHSuM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cenkalti_backoff",
         importpath = "github.com/cenkalti/backoff",
-        version = "v0.0.0-20190506075156-2146c9339422",
-        sum = "h1:+FKjzBIdfBHYDvxCv+djmDJdes/AoDtg8gpcxowBlF8=",
+        version = "v1.1.1-0.20190506075156-2146c9339422",
+        sum = "h1:8eZxmY1yvxGHzdzTEhI09npjMVGzNAdrqzruTX6jcK4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cenkalti_backoff_v4",
         importpath = "github.com/cenkalti/backoff/v4",
         version = "v4.0.2",
         sum = "h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cespare_xxhash_v2",
         importpath = "github.com/cespare/xxhash/v2",
         version = "v2.1.1",
         sum = "h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_chai2010_gettext_go",
         importpath = "github.com/chai2010/gettext-go",
         version = "v0.0.0-20160711120539-c6fed771bfd5",
         sum = "h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_checkpoint_restore_go_criu_v4",
         importpath = "github.com/checkpoint-restore/go-criu/v4",
-        version = "v4.0.2",
-        sum = "h1:jt+rnBIhFtPw0fhtpYGcUOilh4aO9Hj7r+YLEtf30uA=",
+        version = "v4.1.0",
+        sum = "h1:WW2B2uxx9KWF6bGlHqhm8Okiafwwx7Y2kcpn8lCpjgo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cilium_ebpf",
         importpath = "github.com/cilium/ebpf",
         version = "v0.0.0-20200702112145-1c8d4c9ef775",
         sum = "h1:cHzBGGVew0ezFsq2grfy2RsB8hO/eNyBgOLHBCqfR1U=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_container_storage_interface_spec",
         importpath = "github.com/container-storage-interface/spec",
         version = "v1.2.0",
         sum = "h1:bD9KIVgaVKKkQ/UbVUY9kCaH/CJbhNxe0eeB4JeJV2s=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_btrfs",
         importpath = "github.com/containerd/btrfs",
-        version = "v0.0.0-20200117014249-153935315f4a",
-        sum = "h1:u5X1yvVEsXLcuTWYsFSpTgQKRvo2VTB5gOHcERpF9ZI=",
+        version = "v0.0.0-20201111183144-404b9149801e",
+        sum = "h1:chFw/cg0TDyK43qm8DKbblny2WHc4ML+j1KOkdEp9pI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_cgroups",
@@ -168,18 +264,26 @@
         version = "v0.0.0-20200710171044-318312a37340",
         sum = "h1:9atoWyI9RtXFwf7UDbme/6M8Ud0rFrx+Q3ZWgSnsxtw=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_console",
         importpath = "github.com/containerd/console",
         version = "v1.0.0",
         sum = "h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_containerd",
         importpath = "github.com/containerd/containerd",
-        version = "v1.4.0-beta.2",
-        sum = "h1:qZelipNh4yeTHIyzcNteRPoo/Mb9sFCrDtCNWWSXJHQ=",
+        version = "v1.4.3",
+        sum = "h1:ijQT13JedHSHrQGWFcGEwzcNKrAGIiZ+jSD5QQG07SY=",
         build_file_proto_mode = "disable",
         build_tags = [
             "no_zfs",
@@ -187,73 +291,122 @@
             "no_devicemapper",
             "no_btrfs",
         ],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_continuity",
         importpath = "github.com/containerd/continuity",
-        version = "v0.0.0-20200413184840-d3ef23f19fbb",
-        sum = "h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk=",
+        version = "v0.0.0-20200710164510-efbc4488d8fe",
+        sum = "h1:PEmIrUvwG9Yyv+0WKZqjXfSFDeZjs/q15g0m08BYS9k=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_cri",
         importpath = "github.com/containerd/cri",
-        version = "v1.11.1-0.20200705100038-8fb244a65baa",
-        sum = "h1:qqB+Jjek9F6LdsEzQwYWu3PmKkWvFyPr8eCUZPUfCoU=",
+        version = "v1.19.1-0.20201126003523-adc0b6a578ed",
+        sum = "h1:M2yIwrNSafh4rW/yXAiAlSqpydW7vjvDjZ0ClMb+EMQ=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_fifo",
         importpath = "github.com/containerd/fifo",
         version = "v0.0.0-20200410184934-f15a3290365b",
         sum = "h1:qUtCegLdOUVfVJOw+KDg6eJyE1TGvLlkGEd1091kSSQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_go_cni",
         importpath = "github.com/containerd/go-cni",
-        version = "v1.0.0",
-        sum = "h1:A681A9YQ5Du9V2/gZGk/pTm6g69wF0aGd9qFN9syB1E=",
+        version = "v1.0.1",
+        sum = "h1:VXr2EkOPD0v1gu7CKfof6XzEIDzsE/dI9yj/W7PSWLs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_go_runc",
         importpath = "github.com/containerd/go-runc",
         version = "v0.0.0-20200220073739-7016d3ce2328",
         sum = "h1:PRTagVMbJcCezLcHXe8UJvR1oBzp2lG3CEumeFOLOds=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_imgcrypt",
         importpath = "github.com/containerd/imgcrypt",
         version = "v1.0.1",
         sum = "h1:IyI3IIP4m6zrNFuNFT7HizGVcuD6BYJFpdM1JvPKCbQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_ttrpc",
         importpath = "github.com/containerd/ttrpc",
-        version = "v1.0.1",
-        sum = "h1:IfVOxKbjyBn9maoye2JN95pgGYOmPkQVqxtOu7rtNIc=",
+        version = "v1.0.2-0.20210119122237-222b428f008e",
+        sum = "h1:+Fbjfo26pg4HtkAw9sC/YhUwaAb16355o/J/oHkyCDc=",
+        replace = "github.com/monogon-dev/ttrpc",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containerd_typeurl",
         importpath = "github.com/containerd/typeurl",
         version = "v1.0.1",
         sum = "h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5Djw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containernetworking_cni",
         importpath = "github.com/containernetworking/cni",
-        version = "v0.7.1",
-        sum = "h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=",
+        version = "v0.8.0",
+        sum = "h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containernetworking_plugins",
         importpath = "github.com/containernetworking/plugins",
         version = "v0.8.2",
         sum = "h1:5lnwfsAYO+V7yXhysJKy3E1A2Gy9oVut031zfdOzI9w=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_containers_ocicrypt",
         importpath = "github.com/containers/ocicrypt",
         version = "v1.0.1",
         sum = "h1:EToign46OSLTFWnb2oNj9RG3XDnkOX8r28ZIXUuk5Pc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coredns_coredns",
@@ -264,294 +417,490 @@
             "//third_party/go/patches:coredns-remove-unused-plugins.patch",
         ],
         patch_args = ["-p1"],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_go_iptables",
         importpath = "github.com/coreos/go-iptables",
         version = "v0.4.2",
         sum = "h1:KH0EwId05JwWIfb96gWvkiT2cbuOu8ygqUaB+yPAwIg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_go_oidc",
         importpath = "github.com/coreos/go-oidc",
         version = "v2.1.0+incompatible",
         sum = "h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_go_semver",
         importpath = "github.com/coreos/go-semver",
         version = "v0.3.0",
         sum = "h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_go_systemd",
         importpath = "github.com/coreos/go-systemd",
         version = "v0.0.0-20190321100706-95778dfbb74e",
         sum = "h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_go_systemd_v22",
         importpath = "github.com/coreos/go-systemd/v22",
-        version = "v22.0.0",
-        sum = "h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=",
+        version = "v22.1.0",
+        sum = "h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_coreos_pkg",
         importpath = "github.com/coreos/pkg",
         version = "v0.0.0-20180928190104-399ea9e2e55f",
         sum = "h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cosiner_argv",
         importpath = "github.com/cosiner/argv",
         version = "v0.0.0-20170225145430-13bacc38a0a5",
         sum = "h1:rIXlvz2IWiupMFlC45cZCXZFvKX/ExBcSLrDy2G0Lp8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cpuguy83_go_md2man_v2",
         importpath = "github.com/cpuguy83/go-md2man/v2",
         version = "v2.0.0",
         sum = "h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_cyphar_filepath_securejoin",
         importpath = "github.com/cyphar/filepath-securejoin",
         version = "v0.2.2",
         sum = "h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_davecgh_go_spew",
         importpath = "github.com/davecgh/go-spew",
         version = "v1.1.1",
         sum = "h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_daviddengcn_go_colortext",
         importpath = "github.com/daviddengcn/go-colortext",
         version = "v0.0.0-20160507010035-511bcaf42ccd",
         sum = "h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_dgrijalva_jwt_go",
         importpath = "github.com/dgrijalva/jwt-go",
         version = "v3.2.0+incompatible",
         sum = "h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_diskfs_go_diskfs",
         importpath = "github.com/diskfs/go-diskfs",
         version = "v1.0.0",
         sum = "h1:sLQnXItICiYgiHcYNNujKT9kOKnk7diOvZGEKvxrwpc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_dnstap_golang_dnstap",
         importpath = "github.com/dnstap/golang-dnstap",
         version = "v0.2.0",
         sum = "h1:+NrmP4mkaTeKYV7xJ5FXpUxRn0RpcgoQcsOCTS8WQPk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_distribution",
         importpath = "github.com/docker/distribution",
         version = "v2.7.1+incompatible",
         sum = "h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_docker",
         importpath = "github.com/docker/docker",
         version = "v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible",
         sum = "h1:ax4NateCD5bjRTqLvQBlFrSUPOoZRgEXWpJ6Bmu6OO0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_go_connections",
         importpath = "github.com/docker/go-connections",
         version = "v0.4.0",
         sum = "h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_go_events",
         importpath = "github.com/docker/go-events",
         version = "v0.0.0-20190806004212-e31b211e4f1c",
         sum = "h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_go_metrics",
         importpath = "github.com/docker/go-metrics",
         version = "v0.0.1",
         sum = "h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_go_units",
         importpath = "github.com/docker/go-units",
         version = "v0.4.0",
         sum = "h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_docker_spdystream",
         importpath = "github.com/docker/spdystream",
         version = "v0.0.0-20160310174837-449fdfce4d96",
         sum = "h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_dustin_go_humanize",
         importpath = "github.com/dustin/go-humanize",
         version = "v1.0.0",
         sum = "h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_elazarl_goproxy",
         importpath = "github.com/elazarl/goproxy",
         version = "v0.0.0-20180725130230-947c36da3153",
         sum = "h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_emicklei_go_restful",
         importpath = "github.com/emicklei/go-restful",
         version = "v2.9.5+incompatible",
         sum = "h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_euank_go_kmsg_parser",
         importpath = "github.com/euank/go-kmsg-parser",
         version = "v2.0.0+incompatible",
         sum = "h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_evanphx_json_patch",
         importpath = "github.com/evanphx/json-patch",
         version = "v0.0.0-20190815234213-e83c0a1c26c8",
         sum = "h1:DM7gHzQfHwIj+St8zaPOI6iQEPAxOwIkskvw6s9rDaM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_exponent_io_jsonpath",
         importpath = "github.com/exponent-io/jsonpath",
         version = "v0.0.0-20151013193312-d6023ce2651d",
         sum = "h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_farsightsec_golang_framestream",
         importpath = "github.com/farsightsec/golang-framestream",
         version = "v0.0.0-20190425193708-fa4b164d59b8",
         sum = "h1:/iPdQppoAsTfML+yqFSq2EBChiEMnRkh5WvhFgtWwcU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_fatih_camelcase",
         importpath = "github.com/fatih/camelcase",
         version = "v1.0.0",
         sum = "h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_fatih_color",
         importpath = "github.com/fatih/color",
         version = "v1.7.0",
         sum = "h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_flynn_go_shlex",
         importpath = "github.com/flynn/go-shlex",
         version = "v0.0.0-20150515145356-3f9db97f8568",
         sum = "h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_fullsailor_pkcs7",
         importpath = "github.com/fullsailor/pkcs7",
         version = "v0.0.0-20180613152042-8306686428a5",
         sum = "h1:v+vxrd9XS8uWIXG2RK0BHCnXc30qLVQXVqbK+IOmpXk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_ghodss_yaml",
         importpath = "github.com/ghodss/yaml",
         version = "v1.0.0",
         sum = "h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_delve_delve",
         importpath = "github.com/go-delve/delve",
         version = "v1.4.1",
         sum = "h1:kZs0umEv+VKnK84kY9/ZXWrakdLTeRTyYjFdgLelZCQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_logr_logr",
         importpath = "github.com/go-logr/logr",
         version = "v0.2.0",
         sum = "h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_analysis",
         importpath = "github.com/go-openapi/analysis",
         version = "v0.19.5",
         sum = "h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_errors",
         importpath = "github.com/go-openapi/errors",
         version = "v0.19.2",
         sum = "h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_jsonpointer",
         importpath = "github.com/go-openapi/jsonpointer",
         version = "v0.19.3",
         sum = "h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_jsonreference",
         importpath = "github.com/go-openapi/jsonreference",
         version = "v0.19.3",
         sum = "h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_loads",
         importpath = "github.com/go-openapi/loads",
         version = "v0.19.4",
         sum = "h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_runtime",
         importpath = "github.com/go-openapi/runtime",
         version = "v0.19.4",
         sum = "h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_spec",
         importpath = "github.com/go-openapi/spec",
         version = "v0.19.3",
         sum = "h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_strfmt",
         importpath = "github.com/go-openapi/strfmt",
         version = "v0.19.3",
         sum = "h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_swag",
         importpath = "github.com/go-openapi/swag",
         version = "v0.19.5",
         sum = "h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_openapi_validate",
         importpath = "github.com/go-openapi/validate",
         version = "v0.19.5",
         sum = "h1:QhCBKRYqZR+SKo4gl1lPhPahope8/RLt6EVgY8X80w0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_stack_stack",
         importpath = "github.com/go-stack/stack",
         version = "v1.8.0",
         sum = "h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_godbus_dbus_v5",
         importpath = "github.com/godbus/dbus/v5",
         version = "v5.0.3",
         sum = "h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_gofrs_flock",
         importpath = "github.com/gofrs/flock",
         version = "v0.6.1-0.20180915234121-886344bea079",
         sum = "h1:JFTFz3HZTGmgMz4E1TabNBNJljROSYgja1b4l50FNVs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_gogo_googleapis",
@@ -559,554 +908,908 @@
         version = "v1.3.2",
         sum = "h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_gogo_protobuf",
         importpath = "github.com/gogo/protobuf",
         version = "v1.3.1",
         sum = "h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_golang_groupcache",
         importpath = "github.com/golang/groupcache",
         version = "v0.0.0-20191227052852-215e87163ea7",
         sum = "h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_btree",
         importpath = "github.com/google/btree",
         version = "v1.0.0",
         sum = "h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_cadvisor",
         importpath = "github.com/google/cadvisor",
         version = "v0.36.1-0.20200623171404-8450c56c21bc",
         sum = "h1:il4pi2iOP5NRkBgnZH3n0GDqSCNEJ/QIRJrCAfU5h38=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_certificate_transparency_go",
         importpath = "github.com/google/certificate-transparency-go",
         version = "v1.1.0",
         sum = "h1:10MlrYzh5wfkToxWI4yJzffsxLfxcEDlOATMx/V9Kzw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_go_cmp",
         importpath = "github.com/google/go-cmp",
         version = "v0.4.0",
         sum = "h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_go_dap",
         importpath = "github.com/google/go-dap",
         version = "v0.2.0",
         sum = "h1:whjIGQRumwbR40qRU7CEKuFLmePUUc2s4Nt9DoXXxWk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_go_tpm",
         importpath = "github.com/google/go-tpm",
         version = "v0.1.2-0.20190725015402-ae6dd98980d4",
         sum = "h1:GNNkIb6NSjYfw+KvgUFW590mcgsSFihocSrbXct1sEw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_go_tpm_tools",
         importpath = "github.com/google/go-tpm-tools",
         version = "v0.0.0-20190731025042-f8c04ff88181",
         sum = "h1:1Y5W2uh6E7I6hhI6c0WVSbV+Ae15uhemqi3RvSgtZpk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_gofuzz",
         importpath = "github.com/google/gofuzz",
         version = "v1.1.0",
         sum = "h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_gopacket",
         importpath = "github.com/google/gopacket",
         version = "v1.1.17",
         sum = "h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_gvisor",
         importpath = "github.com/google/gvisor",
-        version = "v0.0.0-20200511005220-c52195d25825",
-        sum = "h1:Ryt0ml851mYbHu2ibbtjOCyJCDYdqdhEv5INoPR6Ovs=",
+        version = "v0.0.0-20201216082428-b645fcd241a8",
+        sum = "h1:gNssWp0Zg2Ij2OMz4Gi5ciVLnMVGzqfvPOADTN1ou+E=",
         patches = [
             "//third_party/go/patches:gvisor.patch",
+            "//third_party/go/patches:gvisor-build-against-newer-runtime-specs.patch",
         ],
         patch_args = ["-p1"],
-    )
-    go_repository(
-        name = "com_github_google_gvisor_containerd_shim",
-        importpath = "github.com/google/gvisor-containerd-shim",
-        version = "v0.0.4",
-        sum = "h1:RdBNQHpoQ3ekzfXYIV4+nQJ3a2xLnIHuZJkM40OEtyA=",
-        patches = [
-            "//third_party/go/patches:gvisor-containerd-shim.patch",
-            "//third_party/go/patches:gvisor-containerd-shim-build.patch",
-            "//third_party/go/patches:gvisor-containerd-shim-nogo.patch",
-            "//third_party/go/patches:gvisor-shim-root.patch",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
         ],
-        patch_args = ["-p1"],
     )
     go_repository(
         name = "com_github_google_nftables",
         importpath = "github.com/google/nftables",
         version = "v0.0.0-20200316075819-7127d9d22474",
         sum = "h1:D6bN82zzK92ywYsE+Zjca7EHZCRZbcNTU3At7WdxQ+c=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_subcommands",
         importpath = "github.com/google/subcommands",
-        version = "v0.0.0-20190508160503-636abe8753b8",
-        sum = "h1:GZGUPQiZfYrd9uOqyqwbQcHPkz/EZJVkZB1MkaO9UBI=",
+        version = "v1.0.2-0.20190508160503-636abe8753b8",
+        sum = "h1:8nlgEAjIalk6uj/CGKCdOO8CQqTeysvcW4RFZ6HbkGM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_google_uuid",
         importpath = "github.com/google/uuid",
         version = "v1.1.1",
         sum = "h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_googleapis_gnostic",
         importpath = "github.com/googleapis/gnostic",
         version = "v0.4.1",
         sum = "h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_gorilla_websocket",
         importpath = "github.com/gorilla/websocket",
         version = "v1.4.0",
         sum = "h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_gregjones_httpcache",
         importpath = "github.com/gregjones/httpcache",
         version = "v0.0.0-20180305231024-9cad4c3443a7",
         sum = "h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_grpc_ecosystem_go_grpc_middleware",
         importpath = "github.com/grpc-ecosystem/go-grpc-middleware",
         version = "v1.0.1-0.20190118093823-f849b5445de4",
         sum = "h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_grpc_ecosystem_go_grpc_prometheus",
         importpath = "github.com/grpc-ecosystem/go-grpc-prometheus",
         version = "v1.2.0",
         sum = "h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_grpc_ecosystem_grpc_gateway",
         importpath = "github.com/grpc-ecosystem/grpc-gateway",
         version = "v1.9.5",
         sum = "h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_grpc_ecosystem_grpc_opentracing",
         importpath = "github.com/grpc-ecosystem/grpc-opentracing",
         version = "v0.0.0-20180507213350-8e809c8a8645",
         sum = "h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_grpc_grpc",
         importpath = "github.com/grpc/grpc",
-        version = "v1.26.0",
-        sum = "h1:0/fjvIF5JHJdr34/JPEk1DJFFonjW37pDLvuAy9YieQ=",
+        version = "v1.29.1",
+        sum = "h1:oDOYav2X6WE7espebiQ//iP9N+/gGygUv6XuuyvkFMc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_hashicorp_errwrap",
         importpath = "github.com/hashicorp/errwrap",
         version = "v1.0.0",
         sum = "h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_hashicorp_go_multierror",
         importpath = "github.com/hashicorp/go-multierror",
         version = "v1.0.0",
         sum = "h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_hashicorp_golang_lru",
         importpath = "github.com/hashicorp/golang-lru",
         version = "v0.5.3",
         sum = "h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_hashicorp_hcl",
         importpath = "github.com/hashicorp/hcl",
         version = "v1.0.0",
         sum = "h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_hpcloud_tail",
         importpath = "github.com/hpcloud/tail",
         version = "v1.0.0",
         sum = "h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_imdario_mergo",
         importpath = "github.com/imdario/mergo",
         version = "v0.3.7",
         sum = "h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_infobloxopen_go_trees",
         importpath = "github.com/infobloxopen/go-trees",
         version = "v0.0.0-20190313150506-2af4e13f9062",
         sum = "h1:d3VSuNcgTCn21dNMm8g412Fck/XWFmMj4nJhhHT7ZZ0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_insomniacslk_dhcp",
         importpath = "github.com/insomniacslk/dhcp",
         version = "v0.0.0-20200922210017-67c425063dca",
         sum = "h1:zhwTlFGM8ZkD5J/c43IWkxSJQWzhm20QWou8zajbCck=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_j_keck_arping",
         importpath = "github.com/j-keck/arping",
         version = "v0.0.0-20160618110441-2cf9dc699c56",
         sum = "h1:742eGXur0715JMq73aD95/FU0XpVKXqNuTnEfXsLOYQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_joho_godotenv",
         importpath = "github.com/joho/godotenv",
         version = "v1.3.0",
         sum = "h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_jonboulle_clockwork",
         importpath = "github.com/jonboulle/clockwork",
         version = "v0.1.0",
         sum = "h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_json_iterator_go",
         importpath = "github.com/json-iterator/go",
-        version = "v1.1.9",
-        sum = "h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=",
+        version = "v1.1.10",
+        sum = "h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_karrick_godirwalk",
         importpath = "github.com/karrick/godirwalk",
         version = "v1.7.5",
         sum = "h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_kevinburke_go_bindata",
         importpath = "github.com/kevinburke/go-bindata",
         version = "v3.16.0+incompatible",
         sum = "h1:TFzFZop2KxGhqNwsyjgmIh5JOrpG940MZlm5gNbxr8g=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_koneu_natend",
         importpath = "github.com/koneu/natend",
         version = "v0.0.0-20150829182554-ec0926ea948d",
         sum = "h1:MFX8DxRnKMY/2M3H61iSsVbo/n3h0MWGmWNN1UViOU0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_konsorten_go_windows_terminal_sequences",
         importpath = "github.com/konsorten/go-windows-terminal-sequences",
         version = "v1.0.3",
         sum = "h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_kr_pretty",
         importpath = "github.com/kr/pretty",
-        version = "v0.2.0",
-        sum = "h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=",
+        version = "v0.1.0",
+        sum = "h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_kr_pty",
         importpath = "github.com/kr/pty",
-        version = "v1.1.1",
-        sum = "h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=",
+        version = "v1.1.4-0.20190131011033-7dc38fb350b1",
+        sum = "h1:zc0R6cOw98cMengLA0fvU55mqbnN7sd/tBMLzSejp+M=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_liggitt_tabwriter",
         importpath = "github.com/liggitt/tabwriter",
         version = "v0.0.0-20181228230101-89fcab3d43de",
         sum = "h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_lithammer_dedent",
         importpath = "github.com/lithammer/dedent",
         version = "v1.1.0",
         sum = "h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_magiconair_properties",
         importpath = "github.com/magiconair/properties",
         version = "v1.8.1",
         sum = "h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mailru_easyjson",
         importpath = "github.com/mailru/easyjson",
         version = "v0.7.0",
         sum = "h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mattn_go_colorable",
         importpath = "github.com/mattn/go-colorable",
         version = "v0.0.9",
         sum = "h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mattn_go_isatty",
         importpath = "github.com/mattn/go-isatty",
         version = "v0.0.4",
         sum = "h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mattn_go_runewidth",
         importpath = "github.com/mattn/go-runewidth",
         version = "v0.0.2",
         sum = "h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_matttproud_golang_protobuf_extensions",
         importpath = "github.com/matttproud/golang_protobuf_extensions",
         version = "v1.0.1",
         sum = "h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mdlayher_ethernet",
         importpath = "github.com/mdlayher/ethernet",
         version = "v0.0.0-20190606142754-0394541c37b7",
         sum = "h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mdlayher_genetlink",
         importpath = "github.com/mdlayher/genetlink",
         version = "v1.0.0",
         sum = "h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mdlayher_netlink",
         importpath = "github.com/mdlayher/netlink",
         version = "v1.1.0",
         sum = "h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mdlayher_raw",
         importpath = "github.com/mdlayher/raw",
         version = "v0.0.0-20191009151244-50f2db8cc065",
         sum = "h1:aFkJ6lx4FPip+S+Uw4aTegFMct9shDvP+79PsSxpm3w=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_miekg_dns",
         importpath = "github.com/miekg/dns",
         version = "v1.1.29",
         sum = "h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mindprince_gonvml",
         importpath = "github.com/mindprince/gonvml",
         version = "v0.0.0-20190828220739-9ebdce4bb989",
         sum = "h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mistifyio_go_zfs",
         importpath = "github.com/mistifyio/go-zfs",
         version = "v2.1.2-0.20190413222219-f784269be439+incompatible",
         sum = "h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mitchellh_go_wordwrap",
         importpath = "github.com/mitchellh/go-wordwrap",
         version = "v1.0.0",
         sum = "h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mitchellh_mapstructure",
         importpath = "github.com/mitchellh/mapstructure",
         version = "v1.1.2",
         sum = "h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_moby_sys_mountinfo",
         importpath = "github.com/moby/sys/mountinfo",
         version = "v0.1.3",
         sum = "h1:KIrhRO14+AkwKvG/g2yIpNMOUVZ02xNhOw8KY1WsLOI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_moby_term",
         importpath = "github.com/moby/term",
         version = "v0.0.0-20200312100748-672ec06f55cd",
         sum = "h1:aY7OQNf2XqY/JQ6qREWamhI/81os/agb2BAGpcx5yWI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_modern_go_concurrent",
         importpath = "github.com/modern-go/concurrent",
         version = "v0.0.0-20180306012644-bacd9c7ef1dd",
         sum = "h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_modern_go_reflect2",
         importpath = "github.com/modern-go/reflect2",
         version = "v1.0.1",
         sum = "h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
+    )
+    go_repository(
+        name = "com_github_mohae_deepcopy",
+        importpath = "github.com/mohae/deepcopy",
+        version = "v0.0.0-20170308212314-bb9b5e7adda9",
+        sum = "h1:Sha2bQdoWE5YQPTlJOL31rmce94/tYi113SlFo1xQ2c=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_morikuni_aec",
         importpath = "github.com/morikuni/aec",
         version = "v1.0.0",
         sum = "h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mrunalp_fileutils",
         importpath = "github.com/mrunalp/fileutils",
         version = "v0.0.0-20200520151820-abd8a0e76976",
         sum = "h1:aZQToFSLH8ejFeSkTc3r3L4dPImcj7Ib/KgmkQqbGGg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_munnerz_goautoneg",
         importpath = "github.com/munnerz/goautoneg",
         version = "v0.0.0-20191010083416-a7dc8b61c822",
         sum = "h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_mxk_go_flowrate",
         importpath = "github.com/mxk/go-flowrate",
         version = "v0.0.0-20140419014527-cca7078d478f",
         sum = "h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_olekukonko_tablewriter",
         importpath = "github.com/olekukonko/tablewriter",
         version = "v0.0.0-20170122224234-a0225b3f23b5",
         sum = "h1:58+kh9C6jJVXYjt8IE48G2eWl6BjwU5Gj0gqY84fy78=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_onsi_ginkgo",
         importpath = "github.com/onsi/ginkgo",
         version = "v1.11.0",
         sum = "h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_onsi_gomega",
         importpath = "github.com/onsi/gomega",
         version = "v1.7.0",
         sum = "h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_opencontainers_go_digest",
         importpath = "github.com/opencontainers/go-digest",
         version = "v1.0.0",
         sum = "h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_opencontainers_image_spec",
         importpath = "github.com/opencontainers/image-spec",
         version = "v1.0.1",
         sum = "h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_opencontainers_runc",
         importpath = "github.com/opencontainers/runc",
-        version = "v1.0.0-rc91",
-        sum = "h1:Tp8LWs5G8rFpzTsbRjAtQkPVexhCu0bnANE5IfIhJ6g=",
+        version = "v1.0.0-rc92",
+        sum = "h1:+IczUKCRzDzFDnw99O/PAqrcBBCoRp9xN3cB1SYSNS4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
-        name = "com_github_opencontainers_runtime-spec",
+        name = "com_github_opencontainers_runtime_spec",
         importpath = "github.com/opencontainers/runtime-spec",
-        version = "v1.0.3-0.20200520003142-237cc4f519e2",
-        sum = "h1:9mv9SC7GWmRWE0J/+oD8w3GsN2KYGKtg6uwLN7hfP5E=",
+        version = "v1.0.3-0.20200728170252-4d89ac9fbff6",
+        sum = "h1:NhsM2gc769rVWDqJvapK37r+7+CBXI8xHhnfnt8uQsg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_opencontainers_selinux",
         importpath = "github.com/opencontainers/selinux",
-        version = "v1.5.1",
-        sum = "h1:jskKwSMFYqyTrHEuJgQoUlTcId0av64S6EWObrIfn5Y=",
+        version = "v1.6.0",
+        sum = "h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY=",
         build_tags = [
             "selinux",
         ],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_opentracing_opentracing_go",
         importpath = "github.com/opentracing/opentracing-go",
         version = "v1.1.0",
         sum = "h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_peterbourgon_diskv",
         importpath = "github.com/peterbourgon/diskv",
         version = "v2.0.1+incompatible",
         sum = "h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_peterh_liner",
         importpath = "github.com/peterh/liner",
         version = "v0.0.0-20170317030525-88609521dc4b",
         sum = "h1:8uaXtUkxiy+T/zdLWuxa/PG4so0TPZDZfafFNNSaptE=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_pkg_errors",
         importpath = "github.com/pkg/errors",
         version = "v0.9.1",
         sum = "h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_pquerna_cachecontrol",
         importpath = "github.com/pquerna/cachecontrol",
         version = "v0.0.0-20171018203845-0dec1b30a021",
         sum = "h1:0XM1XL/OFFJjXsYXlG30spTkV/E9+gmd5GD1w2HE8xM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_prometheus_client_golang",
         importpath = "github.com/prometheus/client_golang",
         version = "v1.6.0",
         sum = "h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_prometheus_client_model",
         importpath = "github.com/prometheus/client_model",
         version = "v0.2.0",
         sum = "h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_prometheus_common",
         importpath = "github.com/prometheus/common",
         version = "v0.9.1",
         sum = "h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_prometheus_procfs",
         importpath = "github.com/prometheus/procfs",
         version = "v0.0.11",
         sum = "h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_rekby_gpt",
         importpath = "github.com/rekby/gpt",
         version = "v0.0.0-20200219180433-a930afbc6edc",
         sum = "h1:goZGTwEEn8mWLcY012VouWZWkJ8GrXm9tS3VORMxT90=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_robfig_cron",
         importpath = "github.com/robfig/cron",
         version = "v1.1.0",
         sum = "h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_russross_blackfriday",
         importpath = "github.com/russross/blackfriday",
         version = "v1.5.2",
         sum = "h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_russross_blackfriday_v2",
         importpath = "github.com/russross/blackfriday/v2",
         version = "v2.0.1",
         sum = "h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_safchain_ethtool",
         importpath = "github.com/safchain/ethtool",
         version = "v0.0.0-20190326074333-42ed695e3de8",
         sum = "h1:2c1EFnZHIPCW8qKWgHMH/fX2PkSabFc5mrVzfUNdg5U=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_sbezverk_nfproxy",
@@ -1117,138 +1820,233 @@
             "//third_party/go/patches:nfproxy.patch",
         ],
         patch_args = ["-p1"],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_sbezverk_nftableslib",
         importpath = "github.com/sbezverk/nftableslib",
         version = "v0.0.0-20200402150358-c20bed91f482",
         sum = "h1:k7gEZ/EwJhHDTRXFUZQlE4/p1cmoha7zL7PWCDG3ZHQ=",
-    )
-    go_repository(
-        name = "com_github_seccomp_libseccomp_golang",
-        importpath = "github.com/seccomp/libseccomp-golang",
-        version = "v0.9.1",
-        sum = "h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_shurcool_sanitized_anchor_name",
         importpath = "github.com/shurcooL/sanitized_anchor_name",
         version = "v1.0.0",
         sum = "h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_sirupsen_logrus",
         importpath = "github.com/sirupsen/logrus",
         version = "v1.6.0",
         sum = "h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_soheilhy_cmux",
         importpath = "github.com/soheilhy/cmux",
         version = "v0.1.4",
         sum = "h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_afero",
         importpath = "github.com/spf13/afero",
         version = "v1.2.2",
         sum = "h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_cast",
         importpath = "github.com/spf13/cast",
         version = "v1.3.0",
         sum = "h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_cobra",
         importpath = "github.com/spf13/cobra",
         version = "v1.0.0",
         sum = "h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_jwalterweatherman",
         importpath = "github.com/spf13/jwalterweatherman",
         version = "v1.1.0",
         sum = "h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_pflag",
         importpath = "github.com/spf13/pflag",
         version = "v1.0.5",
         sum = "h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_spf13_viper",
         importpath = "github.com/spf13/viper",
         version = "v1.4.0",
         sum = "h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_stretchr_testify",
         importpath = "github.com/stretchr/testify",
         version = "v1.4.0",
         sum = "h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_syndtr_gocapability",
         importpath = "github.com/syndtr/gocapability",
         version = "v0.0.0-20180916011248-d98352740cb2",
         sum = "h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_tchap_go_patricia",
         importpath = "github.com/tchap/go-patricia",
         version = "v2.2.6+incompatible",
         sum = "h1:JvoDL7JSoIP2HDE8AbDH3zC8QBPxmzYe32HHy5yQ+Ck=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_tmc_grpc_websocket_proxy",
         importpath = "github.com/tmc/grpc-websocket-proxy",
         version = "v0.0.0-20190109142713-0ad062ec5ee5",
         sum = "h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_u_root_u_root",
         importpath = "github.com/u-root/u-root",
         version = "v7.0.0+incompatible",
         sum = "h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_urfave_cli",
         importpath = "github.com/urfave/cli",
         version = "v1.22.1",
         sum = "h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_vishvananda_netlink",
         importpath = "github.com/vishvananda/netlink",
         version = "v1.1.0",
         sum = "h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_vishvananda_netns",
         importpath = "github.com/vishvananda/netns",
         version = "v0.0.0-20200520041808-52d707b772fe",
         sum = "h1:mjAZxE1nh8yvuwhGHpdDqdhtNu2dgbpk93TwoXuk5so=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
+    )
+    go_repository(
+        name = "com_github_willf_bitset",
+        importpath = "github.com/willf/bitset",
+        version = "v1.1.11",
+        sum = "h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=",
+        build_tags = [
+            "selinux",
+        ],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_xiang90_probing",
         importpath = "github.com/xiang90/probing",
         version = "v0.0.0-20190116061207-43a291ad63a2",
         sum = "h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_yalue_native_endian",
         importpath = "github.com/yalue/native_endian",
         version = "v0.0.0-20180607135909-51013b03be4f",
         sum = "h1:nsQCScpQ8RRf+wIooqfyyEUINV2cAPuo2uVtHSBbA4M=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_etcd_go_bbolt",
         importpath = "go.etcd.io/bbolt",
         version = "v1.3.5",
         sum = "h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_etcd_go_etcd",
@@ -1256,174 +2054,280 @@
         version = "v0.5.0-alpha.5.0.20200520232829-54ba9589114f",
         sum = "h1:pBCD+Z7cy5WPTq+R6MmJJvDRpn88cp7bmTypBsn91g4=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_mongodb_go_mongo_driver",
         importpath = "go.mongodb.org/mongo-driver",
         version = "v1.1.2",
         sum = "h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_opencensus_go",
         importpath = "go.opencensus.io",
         version = "v0.22.0",
         sum = "h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "net_starlark_go",
         importpath = "go.starlark.net",
         version = "v0.0.0-20190702223751-32f345186213",
         sum = "h1:lkYv5AKwvvduv5XWP6szk/bvvgO6aDeUujhZQXIFTes=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_uber_go_atomic",
         importpath = "go.uber.org/atomic",
         version = "v1.4.0",
         sum = "h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_uber_go_multierr",
         importpath = "go.uber.org/multierr",
         version = "v1.1.0",
         sum = "h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_uber_go_zap",
         importpath = "go.uber.org/zap",
         version = "v1.15.0",
         sum = "h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_arch",
         importpath = "golang.org/x/arch",
         version = "v0.0.0-20190927153633-4e8777c89be4",
         sum = "h1:QlVATYS7JBoZMVaf+cNjb90WD/beKVHnIxFKT4QaHVI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_crypto",
         importpath = "golang.org/x/crypto",
-        version = "v0.0.0-20200220183623-bac4c82f6975",
-        sum = "h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo=",
+        version = "v0.0.0-20200622213623-75b288015ac9",
+        sum = "h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_mod",
         importpath = "golang.org/x/mod",
         version = "v0.3.0",
         sum = "h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_net",
         importpath = "golang.org/x/net",
         version = "v0.0.0-20190311183353-d8887717615a",
         sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_oauth2",
         importpath = "golang.org/x/oauth2",
         version = "v0.0.0-20191202225959-858c2ad4c8b6",
         sum = "h1:pE8b58s1HRDMi8RDc79m0HISf9D4TzseP40cEA6IGfs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_sync",
         importpath = "golang.org/x/sync",
         version = "v0.0.0-20181108010431-42b317875d0f",
         sum = "h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=",
-    )
-    go_repository(
-        name = "org_golang_x_sys",
-        importpath = "golang.org/x/sys",
-        version = "v0.0.0-20200327173247-9dae0f8f5775",
-        sum = "h1:TC0v2RSO1u2kn1ZugjrFXkRZAEaqMN/RW+OTZkBzmLE=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_text",
         importpath = "golang.org/x/text",
         version = "v0.3.0",
         sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_time",
         importpath = "golang.org/x/time",
         version = "v0.0.0-20191024005414-555d28b269f0",
         sum = "h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_tools",
         importpath = "golang.org/x/tools",
         version = "v0.0.0-20201215171152-6307297f4651",
         sum = "h1:bdfqbHwYVvhLEIkESR524rqSsmV06Og3Fgz60LE7vZc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_x_xerrors",
         importpath = "golang.org/x/xerrors",
         version = "v0.0.0-20191204190536-9bdfabe68543",
         sum = "h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "com_zx2c4_golang_wireguard_wgctrl",
         importpath = "golang.zx2c4.com/wireguard/wgctrl",
         version = "v0.0.0-20200515170644-ec7f26be9d9e",
         sum = "h1:fqDhK9OlzaaiFjnyaAfR9Q1RPKCK7OCTLlHGP9f74Nk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_gonum_v1_gonum",
         importpath = "gonum.org/v1/gonum",
         version = "v0.6.2",
         sum = "h1:4r+yNT0+8SWcOkXP+63H2zQbN+USnC73cjGUxnDF94Q=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_google_genproto",
         importpath = "google.golang.org/genproto",
         version = "v0.0.0-20200224152610-e50cd9704f63",
         sum = "h1:YzfoEYWbODU5Fbt37+h7X16BWQbad7Q4S6gclTKFXM8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "org_golang_google_grpc",
         importpath = "google.golang.org/grpc",
-        version = "v1.26.0",
-        sum = "h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=",
+        version = "v1.29.1",
+        sum = "h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_djherbis_times_v1",
         importpath = "gopkg.in/djherbis/times.v1",
         version = "v1.2.0",
         sum = "h1:UCvDKl1L/fmBygl2Y7hubXCnY7t4Yj46ZrBFNUipFbM=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_fsnotify_v1",
         importpath = "gopkg.in/fsnotify.v1",
         version = "v1.4.7",
         sum = "h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_inf_v0",
         importpath = "gopkg.in/inf.v0",
         version = "v0.9.1",
         sum = "h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_natefinch_lumberjack_v2",
         importpath = "gopkg.in/natefinch/lumberjack.v2",
         version = "v2.0.0",
         sum = "h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_square_go_jose_v2",
         importpath = "gopkg.in/square/go-jose.v2",
         version = "v2.2.2",
         sum = "h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_tomb_v1",
         importpath = "gopkg.in/tomb.v1",
         version = "v1.0.0-20141024135613-dd632973f1e7",
         sum = "h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "in_gopkg_yaml_v2",
         importpath = "gopkg.in/yaml.v2",
         version = "v2.2.8",
         sum = "h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_api",
@@ -1431,6 +2335,10 @@
         version = "v0.19.0-rc.0",
         sum = "h1:K+xi+F3RNAxpFyS1f7uHekMNprjFX7WVZDx2lJE+A3A=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_apiextensions_apiserver",
@@ -1438,6 +2346,10 @@
         version = "v0.19.0-rc.0",
         sum = "h1:XGNmUwNvh5gt6sYwCzaxLU6Dr461DVKWlGiaCSKZzyw=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_apimachinery",
@@ -1445,6 +2357,10 @@
         version = "v0.20.0-alpha.0",
         sum = "h1:XCZhrYfFYSC8GBpI4OUJFTH1s5euLMYdoIDQ7u2aDPM=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_apiserver",
@@ -1452,12 +2368,20 @@
         version = "v0.19.0-rc.0",
         sum = "h1:SaF/gMgUeDPbQDKHTMvB2yynBUZpp6s4HYQIOx/LdDQ=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_cli_runtime",
         importpath = "k8s.io/cli-runtime",
         version = "v0.19.0-rc.0",
         sum = "h1:amuzfqubksp5ooo99cpiu6hYe6ua1bGEqw59vZKyRqA=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_client_go",
@@ -1468,24 +2392,40 @@
             "//third_party/go/patches:k8s-client-go.patch",
         ],
         patch_args = ["-p1"],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_cloud_provider",
         importpath = "k8s.io/cloud-provider",
         version = "v0.19.0-rc.0",
         sum = "h1:W1YV1XhdklzoGFZcYmzJnm3D4O6uWaoEAFRF1X4h7uw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_cluster_bootstrap",
         importpath = "k8s.io/cluster-bootstrap",
         version = "v0.19.0-rc.0",
         sum = "h1:2OCD/1YLoWlBisd7MPfPM35ZXFct/eA94TkRs/uAuhg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_component_base",
         importpath = "k8s.io/component-base",
         version = "v0.19.0-rc.0",
         sum = "h1:S/jt6xey1Wg5i5A9/BCkPYekpjJ5zlfuSCCVlNSJ/Yc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_cri_api",
@@ -1493,30 +2433,50 @@
         version = "v0.19.0-rc.0",
         sum = "h1:vXd1YUBZcQkkDb2jYdtaCm+XFA2euMVGVU08EKsN40k=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_csi_translation_lib",
         importpath = "k8s.io/csi-translation-lib",
         version = "v0.19.0-rc.0",
         sum = "h1:2xvrVxnNKtbhilsj/gcD60P9r2PGT+zAEhBWNynySgk=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_gengo",
         importpath = "k8s.io/gengo",
         version = "v0.0.0-20200428234225-8167cfdcfc14",
         sum = "h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_heapster",
         importpath = "k8s.io/heapster",
         version = "v1.2.0-beta.1",
         sum = "h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_klog_v2",
         importpath = "k8s.io/klog/v2",
         version = "v2.2.0",
         sum = "h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kube_aggregator",
@@ -1524,36 +2484,60 @@
         version = "v0.19.0-rc.0",
         sum = "h1:+u9y1c0R2GF8fuaEnlJrdUtxoEmQOON98oatycSquOA=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kube_controller_manager",
         importpath = "k8s.io/kube-controller-manager",
         version = "v0.19.0-rc.0",
         sum = "h1:b78T0fHLtRqOEe/70UzdTI0mN2hOph/krz9B5yI/DN4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kube_openapi",
         importpath = "k8s.io/kube-openapi",
         version = "v0.0.0-20200427153329-656914f816f9",
         sum = "h1:5NC2ITmvg8RoxoH0wgmL4zn4VZqXGsKbxrikjaQx6s4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kube_proxy",
         importpath = "k8s.io/kube-proxy",
         version = "v0.19.0-rc.0",
         sum = "h1:eYzuS4rtUGH8Nglk40WIWSNQyMSTj8pKcGB14BKVhHg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kube_scheduler",
         importpath = "k8s.io/kube-scheduler",
         version = "v0.19.0-rc.0",
         sum = "h1:KiKDepusDaex8fJj2R0F1y2zNj/oPaCzziC7JiuU09o=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kubectl",
         importpath = "k8s.io/kubectl",
         version = "v0.19.0-rc.0",
         sum = "h1:JcCGByIwsglw1eQKUpTfYuxSjvQ5NUQTyxoGp1P/Bx4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kubelet",
@@ -1561,6 +2545,10 @@
         version = "v0.19.0-rc.0",
         sum = "h1:Eii9aWFKr4MtrRSlhxnaLkGZ0WkSb2p6sPyDuMul/Tc=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_kubernetes",
@@ -1581,12 +2569,20 @@
             "//third_party/go/patches:k8s-e2e-tests-providerless.patch",
         ],
         patch_args = ["-p1"],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_legacy_cloud_providers",
         importpath = "k8s.io/legacy-cloud-providers",
         version = "v0.19.0-rc.0",
         sum = "h1:cyf6e9AnQL/ATzZHXDqdwlD+lmRhtKCYPcfeFqb8wn0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_metrics",
@@ -1594,18 +2590,30 @@
         version = "v0.19.0-rc.0",
         sum = "h1:hPBuMVgXakpnLBLe0K9SZxF8T7mH9VaNTY/pKsU/958=",
         build_file_proto_mode = "disable",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_repo_infra",
         importpath = "k8s.io/repo-infra",
-        version = "v0.0.0-20190329054012-df02ded38f95",
-        sum = "h1:PQyAIB6SRdV0a3Vj/VA39L1uANW36k/zg3tOk/Ffh3U=",
+        version = "v0.1.4-0.20210105022653-a3483874bd37",
+        sum = "h1:0GPavEcPKBA0rYl7f6dO0mXYmx7t9RaXD3be2g23Ps4=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_sample_apiserver",
         importpath = "k8s.io/sample-apiserver",
         version = "v0.19.0-rc.0",
         sum = "h1:ZsO1AWW9k79zA+tU1nu7nGMGT7XidiA1jDrfBvMZmzg=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_utils",
@@ -1616,34 +2624,58 @@
             "//third_party/go/patches:k8s-native-mounter.patch",
         ],
         patch_args = ["-p1"],
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_sigs_apiserver_network_proxy_konnectivity_client",
         importpath = "sigs.k8s.io/apiserver-network-proxy/konnectivity-client",
         version = "v0.0.9",
         sum = "h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_sigs_kustomize",
         importpath = "sigs.k8s.io/kustomize",
         version = "v2.0.3+incompatible",
         sum = "h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_sigs_structured_merge_diff_v3",
         importpath = "sigs.k8s.io/structured-merge-diff/v3",
         version = "v3.0.0",
         sum = "h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "io_k8s_sigs_yaml",
         importpath = "sigs.k8s.io/yaml",
         version = "v1.2.0",
         sum = "h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
     go_repository(
         name = "ml_vbom_util",
         importpath = "vbom.ml/util",
         version = "v0.0.0-20160121211510-db5cfe13f5cc",
         sum = "h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=",
+        build_extra_args = [
+            "-go_naming_convention=go_default_library",
+            "-go_naming_convention_external=go_default_library",
+        ],
     )
diff --git a/third_party/go/shelf.pb.text b/third_party/go/shelf.pb.text
index e87d2c4..0fdaced 100644
--- a/third_party/go/shelf.pb.text
+++ b/third_party/go/shelf.pb.text
@@ -63,6 +63,13 @@
 >
 entry: <
   import_path: "github.com/Microsoft/hcsshim"
+  version: "v0.8.10"
+  bazel_name: "com_github_microsoft_hcsshim"
+  sum: "h1:k5wTrpnVU2/xv8ZuzGkbXVd3js5zJ8RnumPo5RxiIxU="
+  semver: "v0.8.10"
+>
+entry: <
+  import_path: "github.com/Microsoft/hcsshim"
   version: "v0.8.9"
   bazel_name: "com_github_microsoft_hcsshim"
   sum: "h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk="
@@ -174,6 +181,13 @@
   semver: "v0.0.0-20190506075156-2146c9339422"
 >
 entry: <
+  import_path: "github.com/cenkalti/backoff"
+  version: "v1.1.1-0.20190506075156-2146c9339422"
+  bazel_name: "com_github_cenkalti_backoff"
+  sum: "h1:8eZxmY1yvxGHzdzTEhI09npjMVGzNAdrqzruTX6jcK4="
+  semver: "v1.1.1-0.20190506075156-2146c9339422"
+>
+entry: <
   import_path: "github.com/cenkalti/backoff/v4"
   version: "v4.0.2"
   bazel_name: "com_github_cenkalti_backoff_v4"
@@ -223,6 +237,13 @@
   semver: "v4.0.2"
 >
 entry: <
+  import_path: "github.com/checkpoint-restore/go-criu/v4"
+  version: "v4.1.0"
+  bazel_name: "com_github_checkpoint_restore_go_criu_v4"
+  sum: "h1:WW2B2uxx9KWF6bGlHqhm8Okiafwwx7Y2kcpn8lCpjgo="
+  semver: "v4.1.0"
+>
+entry: <
   import_path: "github.com/cilium/arping"
   version: "v1.0.1-0.20190728065459-c5eaf8d7a710"
   bazel_name: "com_github_cilium_arping"
@@ -321,6 +342,13 @@
   semver: "v0.0.0-20200117014249-153935315f4a"
 >
 entry: <
+  import_path: "github.com/containerd/btrfs"
+  version: "404b9149801e455c8076f615b06dc0abee0a977a"
+  bazel_name: "com_github_containerd_btrfs"
+  sum: "h1:chFw/cg0TDyK43qm8DKbblny2WHc4ML+j1KOkdEp9pI="
+  semver: "v0.0.0-20201111183144-404b9149801e"
+>
+entry: <
   import_path: "github.com/containerd/cgroups"
   version: "318312a373405e5e91134d8063d04d59768a1bff"
   bazel_name: "com_github_containerd_cgroups"
@@ -363,6 +391,13 @@
   semver: "v1.4.0-beta.2"
 >
 entry: <
+  import_path: "github.com/containerd/containerd"
+  version: "v1.4.3"
+  bazel_name: "com_github_containerd_containerd"
+  sum: "h1:ijQT13JedHSHrQGWFcGEwzcNKrAGIiZ+jSD5QQG07SY="
+  semver: "v1.4.3"
+>
+entry: <
   import_path: "github.com/containerd/continuity"
   version: "0ec596719c75bfd42908850990acea594b7593ac"
   bazel_name: "com_github_containerd_continuity"
@@ -377,6 +412,13 @@
   semver: "v0.0.0-20200413184840-d3ef23f19fbb"
 >
 entry: <
+  import_path: "github.com/containerd/continuity"
+  version: "efbc4488d8fe1bdc16bde3b2d2990d9b3a899165"
+  bazel_name: "com_github_containerd_continuity"
+  sum: "h1:PEmIrUvwG9Yyv+0WKZqjXfSFDeZjs/q15g0m08BYS9k="
+  semver: "v0.0.0-20200710164510-efbc4488d8fe"
+>
+entry: <
   import_path: "github.com/containerd/cri"
   version: "8fb244a65baad2457e6c8658db18ed28b1f77cfe"
   bazel_name: "com_github_containerd_cri"
@@ -385,6 +427,13 @@
 >
 entry: <
   import_path: "github.com/containerd/cri"
+  version: "adc0b6a578ed6f646bb24c1c639d65b70e14cccc"
+  bazel_name: "com_github_containerd_cri"
+  sum: "h1:M2yIwrNSafh4rW/yXAiAlSqpydW7vjvDjZ0ClMb+EMQ="
+  semver: "v1.19.1-0.20201126003523-adc0b6a578ed"
+>
+entry: <
+  import_path: "github.com/containerd/cri"
   version: "c0294ebfe0b4342db85c0faf7727ceb8d8c3afce"
   bazel_name: "com_github_containerd_cri"
   sum: "h1:tkxzigQGIymwkagfa+zsr1GzlYWJCVh6dUVhEc3fQeo="
@@ -419,6 +468,13 @@
   semver: "v1.0.0"
 >
 entry: <
+  import_path: "github.com/containerd/go-cni"
+  version: "v1.0.1"
+  bazel_name: "com_github_containerd_go_cni"
+  sum: "h1:VXr2EkOPD0v1gu7CKfof6XzEIDzsE/dI9yj/W7PSWLs="
+  semver: "v1.0.1"
+>
+entry: <
   import_path: "github.com/containerd/go-runc"
   version: "7016d3ce2328dd2cb1192b2076ebd565c4e8df0c"
   bazel_name: "com_github_containerd_go_runc"
@@ -482,6 +538,13 @@
   semver: "v0.7.1"
 >
 entry: <
+  import_path: "github.com/containernetworking/cni"
+  version: "v0.8.0"
+  bazel_name: "com_github_containernetworking_cni"
+  sum: "h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI="
+  semver: "v0.8.0"
+>
+entry: <
   import_path: "github.com/containernetworking/plugins"
   version: "v0.8.2"
   bazel_name: "com_github_containernetworking_plugins"
@@ -545,6 +608,13 @@
   semver: "v22.0.0"
 >
 entry: <
+  import_path: "github.com/coreos/go-systemd/v22"
+  version: "v22.1.0"
+  bazel_name: "com_github_coreos_go_systemd_v22"
+  sum: "h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg="
+  semver: "v22.1.0"
+>
+entry: <
   import_path: "github.com/coreos/pkg"
   version: "v0.0.0-20180108230652-97fdf19511ea"
   bazel_name: "com_github_coreos_pkg"
@@ -811,6 +881,13 @@
   semver: "v1.7.0"
 >
 entry: <
+  import_path: "github.com/fgiudici/ttrpc"
+  version: "daf72715ae609e8e98df2099e808f6f7f00d817b"
+  bazel_name: "com_github_containerd_ttrpc"
+  sum: "h1:6D4dS2pxoUzG+Lsyl9aawkCurUpBIN/o+hj/UeB+R8U="
+  semver: "v1.0.2-0.20200907082018-daf72715ae60"
+>
+entry: <
   import_path: "github.com/flynn/go-shlex"
   version: "v0.0.0-20150515145356-3f9db97f8568"
   bazel_name: "com_github_flynn_go_shlex"
@@ -1091,6 +1168,13 @@
   semver: "v0.0.0-20200511005220-c52195d25825"
 >
 entry: <
+  import_path: "github.com/google/gvisor"
+  version: "release-20201216.0"
+  bazel_name: "com_github_google_gvisor"
+  sum: "h1:gNssWp0Zg2Ij2OMz4Gi5ciVLnMVGzqfvPOADTN1ou+E="
+  semver: "v0.0.0-20201216082428-b645fcd241a8"
+>
+entry: <
   import_path: "github.com/google/gvisor-containerd-shim"
   version: "104a0ad08c8346a17d56287beb9756b8d52f684f"
   bazel_name: "com_github_google_gvisor_containerd_shim"
@@ -1119,6 +1203,13 @@
   semver: "v0.0.0-20190508160503-636abe8753b8"
 >
 entry: <
+  import_path: "github.com/google/subcommands"
+  version: "v1.0.2-0.20190508160503-636abe8753b8"
+  bazel_name: "com_github_google_subcommands"
+  sum: "h1:8nlgEAjIalk6uj/CGKCdOO8CQqTeysvcW4RFZ6HbkGM="
+  semver: "v1.0.2-0.20190508160503-636abe8753b8"
+>
+entry: <
   import_path: "github.com/google/uuid"
   version: "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
   bazel_name: "com_github_google_uuid"
@@ -1189,6 +1280,13 @@
   semver: "v1.26.0"
 >
 entry: <
+  import_path: "github.com/grpc/grpc"
+  version: "v1.29.1"
+  bazel_name: "com_github_grpc_grpc"
+  sum: "h1:oDOYav2X6WE7espebiQ//iP9N+/gGygUv6XuuyvkFMc="
+  semver: "v1.29.1"
+>
+entry: <
   import_path: "github.com/hashicorp/consul/api"
   version: "v1.2.0"
   bazel_name: "com_github_hashicorp_consul_api"
@@ -1358,6 +1456,13 @@
 >
 entry: <
   import_path: "github.com/json-iterator/go"
+  version: "v1.1.10"
+  bazel_name: "com_github_json_iterator_go"
+  sum: "h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68="
+  semver: "v1.1.10"
+>
+entry: <
+  import_path: "github.com/json-iterator/go"
   version: "v1.1.9"
   bazel_name: "com_github_json_iterator_go"
   sum: "h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns="
@@ -1407,6 +1512,13 @@
 >
 entry: <
   import_path: "github.com/kr/pretty"
+  version: "v0.1.0"
+  bazel_name: "com_github_kr_pretty"
+  sum: "h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+  semver: "v0.1.0"
+>
+entry: <
+  import_path: "github.com/kr/pretty"
   version: "v0.2.0"
   bazel_name: "com_github_kr_pretty"
   sum: "h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs="
@@ -1420,6 +1532,13 @@
   semver: "v1.1.1"
 >
 entry: <
+  import_path: "github.com/kr/pty"
+  version: "v1.1.4-0.20190131011033-7dc38fb350b1"
+  bazel_name: "com_github_kr_pty"
+  sum: "h1:zc0R6cOw98cMengLA0fvU55mqbnN7sd/tBMLzSejp+M="
+  semver: "v1.1.4-0.20190131011033-7dc38fb350b1"
+>
+entry: <
   import_path: "github.com/kr/text"
   version: "v0.1.0"
   bazel_name: "com_github_kr_text"
@@ -1658,6 +1777,27 @@
   semver: "v1.0.1"
 >
 entry: <
+  import_path: "github.com/mohae/deepcopy"
+  version: "v0.0.0-20170308212314-bb9b5e7adda9"
+  bazel_name: "com_github_mohae_deepcopy"
+  sum: "h1:Sha2bQdoWE5YQPTlJOL31rmce94/tYi113SlFo1xQ2c="
+  semver: "v0.0.0-20170308212314-bb9b5e7adda9"
+>
+entry: <
+  import_path: "github.com/monogon-dev/ttrpc"
+  version: "222b428f008e3ecb11cfff12e3fd92e3143a2f01"
+  bazel_name: "com_github_containerd_ttrpc"
+  sum: "h1:+Fbjfo26pg4HtkAw9sC/YhUwaAb16355o/J/oHkyCDc="
+  semver: "v1.0.2-0.20210119122237-222b428f008e"
+>
+entry: <
+  import_path: "github.com/monogon-dev/ttrpc"
+  version: "709eb4614da26a14cd42523f70d81eb75e6f6d6f"
+  bazel_name: "com_github_containerd_ttrpc"
+  sum: "h1:yg5rVmxAREBQdVeaviSpd2AvAEoOoJCparBqMr+BofE="
+  semver: "v1.0.2-0.20210119120416-709eb4614da2"
+>
+entry: <
   import_path: "github.com/morikuni/aec"
   version: "v1.0.0"
   bazel_name: "com_github_morikuni_aec"
@@ -1763,6 +1903,13 @@
   semver: "v1.0.0-rc91"
 >
 entry: <
+  import_path: "github.com/opencontainers/runc"
+  version: "v1.0.0-rc92"
+  bazel_name: "com_github_opencontainers_runc"
+  sum: "h1:+IczUKCRzDzFDnw99O/PAqrcBBCoRp9xN3cB1SYSNS4="
+  semver: "v1.0.0-rc92"
+>
+entry: <
   import_path: "github.com/opencontainers/runtime-spec"
   version: "237cc4f519e2e8f9b235bacccfa8ef5a84df2875"
   bazel_name: "com_github_opencontainers_runtime-spec"
@@ -1777,6 +1924,20 @@
   semver: "v1.0.2-0.20190207185410-29686dbc5559"
 >
 entry: <
+  import_path: "github.com/opencontainers/runtime-spec"
+  version: "4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43"
+  bazel_name: "com_github_opencontainers_runtime_spec"
+  sum: "h1:NhsM2gc769rVWDqJvapK37r+7+CBXI8xHhnfnt8uQsg="
+  semver: "v1.0.3-0.20200728170252-4d89ac9fbff6"
+>
+entry: <
+  import_path: "github.com/opencontainers/runtime-spec"
+  version: "v1.0.2-0.20181111125026-1722abf79c2f"
+  bazel_name: "com_github_opencontainers_runtime_spec"
+  sum: "h1:Pyp2f/uuhJIcUgnIeZaAbwOcyNz8TBlEe6mPpC8kXq8="
+  semver: "v1.0.2-0.20181111125026-1722abf79c2f"
+>
+entry: <
   import_path: "github.com/opencontainers/selinux"
   version: "5215b1806f52b1fcc2070a8826c542c9d33cd3cf"
   bazel_name: "com_github_opencontainers_selinux"
@@ -1791,6 +1952,13 @@
   semver: "v1.5.1"
 >
 entry: <
+  import_path: "github.com/opencontainers/selinux"
+  version: "v1.6.0"
+  bazel_name: "com_github_opencontainers_selinux"
+  sum: "h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY="
+  semver: "v1.6.0"
+>
+entry: <
   import_path: "github.com/opentracing/opentracing-go"
   version: "v1.1.0"
   bazel_name: "com_github_opentracing_opentracing_go"
@@ -2197,6 +2365,13 @@
   semver: "v0.0.0-20200520041808-52d707b772fe"
 >
 entry: <
+  import_path: "github.com/willf/bitset"
+  version: "v1.1.11"
+  bazel_name: "com_github_willf_bitset"
+  sum: "h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE="
+  semver: "v1.1.11"
+>
+entry: <
   import_path: "github.com/xiang90/probing"
   version: "v0.0.0-20190116061207-43a291ad63a2"
   bazel_name: "com_github_xiang90_probing"
@@ -2317,6 +2492,13 @@
 >
 entry: <
   import_path: "golang.org/x/crypto"
+  version: "75b288015ac94e66e3d6715fb68a9b41bf046ec2"
+  bazel_name: "org_golang_x_crypto"
+  sum: "h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
+  semver: "v0.0.0-20200622213623-75b288015ac9"
+>
+entry: <
+  import_path: "golang.org/x/crypto"
   version: "bac4c82f69751a6dd76e702d54b3ceb88adab236"
   bazel_name: "org_golang_x_crypto"
   sum: "h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo="
@@ -2379,6 +2561,13 @@
   semver: "v0.0.0-20190927073244-c990c680b611"
 >
 entry: <
+  import_path: "golang.org/x/sys"
+  version: "ed371f2e16b4b305ee99df548828de367527b76b"
+  bazel_name: "org_golang_x_sys"
+  sum: "h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8="
+  semver: "v0.0.0-20200622214017-ed371f2e16b4"
+>
+entry: <
   import_path: "golang.org/x/text"
   version: "v0.3.0"
   bazel_name: "org_golang_x_text"
@@ -2442,6 +2631,20 @@
   semver: "v1.26.0"
 >
 entry: <
+  import_path: "google.golang.org/grpc"
+  version: "v1.29.1"
+  bazel_name: "org_golang_google_grpc"
+  sum: "h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4="
+  semver: "v1.29.1"
+>
+entry: <
+  import_path: "google.golang.org/grpc"
+  version: "v1.35.0"
+  bazel_name: "org_golang_google_grpc"
+  sum: "h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8="
+  semver: "v1.35.0"
+>
+entry: <
   import_path: "gopkg.in/djherbis/times.v1"
   version: "847c5208d8924cea0acea3376ff62aede93afe39"
   bazel_name: "in_gopkg_djherbis_times_v1"
@@ -2856,6 +3059,13 @@
 >
 entry: <
   import_path: "k8s.io/repo-infra"
+  version: "a3483874bd37251c629c92df6d82a226b0e6ad92"
+  bazel_name: "io_k8s_repo_infra"
+  sum: "h1:0GPavEcPKBA0rYl7f6dO0mXYmx7t9RaXD3be2g23Ps4="
+  semver: "v0.1.4-0.20210105022653-a3483874bd37"
+>
+entry: <
+  import_path: "k8s.io/repo-infra"
   version: "df02ded38f9506e5bbcbf21702034b4fef815f2f"
   bazel_name: "io_k8s_repo_infra"
   sum: "h1:PQyAIB6SRdV0a3Vj/VA39L1uANW36k/zg3tOk/Ffh3U="