diff --git a/cmd/ocitools/validate.go b/cmd/ocitools/validate.go index c9d24c9e1..760b44ea4 100644 --- a/cmd/ocitools/validate.go +++ b/cmd/ocitools/validate.go @@ -16,7 +16,6 @@ import ( "github.com/Sirupsen/logrus" "github.com/blang/semver" - "github.com/opencontainers/ocitools/generate" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" ) @@ -47,6 +46,22 @@ var ( "RLIMIT_RTPRIO", "RLIMIT_RTTIME", } + defaultCaps = []string{ + "CAP_CHOWN", + "CAP_DAC_OVERRIDE", + "CAP_FSETID", + "CAP_FOWNER", + "CAP_MKNOD", + "CAP_NET_RAW", + "CAP_SETGID", + "CAP_SETUID", + "CAP_SETFCAP", + "CAP_SETPCAP", + "CAP_NET_BIND_SERVICE", + "CAP_SYS_CHROOT", + "CAP_KILL", + "CAP_AUDIT_WRITE", + } ) var bundleValidateCommand = cli.Command{ @@ -421,7 +436,7 @@ func envValid(env string) bool { } func capValid(capability string) bool { - for _, val := range generate.DefaultCaps { + for _, val := range defaultCaps { if val == capability { return true } diff --git a/generate/default.go b/generate/default.go deleted file mode 100644 index 85a30ebf0..000000000 --- a/generate/default.go +++ /dev/null @@ -1,21 +0,0 @@ -package generate - -var ( - // DefaultCaps include the default capabilities. - DefaultCaps = []string{ - "CAP_CHOWN", - "CAP_DAC_OVERRIDE", - "CAP_FSETID", - "CAP_FOWNER", - "CAP_MKNOD", - "CAP_NET_RAW", - "CAP_SETGID", - "CAP_SETUID", - "CAP_SETFCAP", - "CAP_SETPCAP", - "CAP_NET_BIND_SERVICE", - "CAP_SYS_CHROOT", - "CAP_KILL", - "CAP_AUDIT_WRITE", - } -)