Drop support for Go 1.10

PiperOrigin-RevId: 210589588
Change-Id: Iba898bc3eb8f13e17c668ceea6dc820fc8180a70

4 files changed, 1 insertions, 59 deletions

diff --git a/runsc/boot/filter/BUILD b/runsc/boot/filter/BUILD
index 96be051fe..d20605a91 100644
--- a/runsc/boot/filter/BUILD
+++ b/runsc/boot/filter/BUILD
@@ -6,8 +6,6 @@ go_library(
     name = "filter",
     srcs = [
         "config.go",
-        "config_go110.go",
-        "config_go111.go",
         "extra_filters.go",
         "extra_filters_msan.go",
         "extra_filters_race.go",
diff --git a/runsc/boot/filter/config.go b/runsc/boot/filter/config.go
index db2e3f9d8..1bec89900 100644
--- a/runsc/boot/filter/config.go
+++ b/runsc/boot/filter/config.go
@@ -60,6 +60,7 @@ var allowedSyscalls = seccomp.SyscallRules{
 	syscall.SYS_MMAP:            {},
 	syscall.SYS_MPROTECT:        {},
 	syscall.SYS_MUNMAP:          {},
+	syscall.SYS_NANOSLEEP:       {},
 	syscall.SYS_POLL:            {},
 	syscall.SYS_PREAD64:         {},
 	syscall.SYS_PWRITE64:        {},
diff --git a/runsc/boot/filter/config_go110.go b/runsc/boot/filter/config_go110.go
deleted file mode 100644
index f4feb4ce4..000000000
--- a/runsc/boot/filter/config_go110.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// 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.
-
-// +build !go1.11
-
-package filter
-
-import (
-	"syscall"
-
-	"gvisor.googlesource.com/gvisor/pkg/seccomp"
-)
-
-// TODO: Remove this file and merge config_go111.go back into
-// config.go once we no longer build with Go 1.10.
-
-func init() {
-	allowedSyscalls[syscall.SYS_PSELECT6] = []seccomp.Rule{}
-}
diff --git a/runsc/boot/filter/config_go111.go b/runsc/boot/filter/config_go111.go
deleted file mode 100644
index f5eb2c3c8..000000000
--- a/runsc/boot/filter/config_go111.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// 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.
-
-// +build go1.11
-
-package filter
-
-import (
-	"syscall"
-
-	"gvisor.googlesource.com/gvisor/pkg/seccomp"
-)
-
-func init() {
-	allowedSyscalls[syscall.SYS_NANOSLEEP] = []seccomp.Rule{}
-}