diff --git a/server/utils.go b/server/utils.go index 56f70f46..bd1c1828 100644 --- a/server/utils.go +++ b/server/utils.go @@ -11,7 +11,6 @@ import ( "github.com/kubernetes-incubator/cri-o/lib/sandbox" "github.com/kubernetes-incubator/cri-o/server/metrics" "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/opencontainers/runtime-tools/validate" "github.com/syndtr/gocapability/capability" pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" ) @@ -179,11 +178,11 @@ func inStringSlice(ss []string, str string) bool { // getOCICapabilitiesList returns a list of all available capabilities. func getOCICapabilitiesList() []string { var caps []string - for _, cap := range capability.List() { - if cap > validate.LastCap() { + for _, c := range capability.List() { + if c > lastCapability() { continue } - caps = append(caps, "CAP_"+strings.ToUpper(cap.String())) + caps = append(caps, "CAP_"+strings.ToUpper(c.String())) } return caps } diff --git a/server/utils_linux.go b/server/utils_linux.go new file mode 100644 index 00000000..5aa03377 --- /dev/null +++ b/server/utils_linux.go @@ -0,0 +1,12 @@ +// +build linux + +package server + +import ( + "github.com/opencontainers/runtime-tools/validate" + "github.com/syndtr/gocapability/capability" +) + +func lastCapability() capability.Cap { + return validate.LastCap() +} diff --git a/server/utils_unsupported.go b/server/utils_unsupported.go new file mode 100644 index 00000000..a36acbce --- /dev/null +++ b/server/utils_unsupported.go @@ -0,0 +1,9 @@ +// +build !linux + +package server + +import "github.com/syndtr/gocapability/capability" + +func lastCapability() capability.Cap { + return capability.Cap(-1) +}