diff options
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 2 | ||||
| -rw-r--r-- | runsc/sandbox/network.go | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index acae012dc..a30a9dd4a 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,12 +1,12 @@ package ring0 import ( - "fmt" "gvisor.dev/gvisor/pkg/cpuid" "io" "reflect" "syscall" + "fmt" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" ) diff --git a/runsc/sandbox/network.go b/runsc/sandbox/network.go index a965a9dcb..333ffb65c 100644 --- a/runsc/sandbox/network.go +++ b/runsc/sandbox/network.go @@ -33,13 +33,6 @@ import ( "gvisor.dev/gvisor/runsc/specutils" ) -const ( - // Annotations used to indicate whether the container corresponds to a - // pod or a container within a pod. - crioContainerTypeAnnotation = "io.kubernetes.cri-o.ContainerType" - containerdContainerTypeAnnotation = "io.kubernetes.cri.container-type" -) - // setupNetwork configures the network stack to mimic the local network // configuration. Docker uses network namespaces with vnets to configure the // network for the container. The untrusted app expects to see the same network |