vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch to using opencontainers/selinux

Browse source 
We have moved selinux support out of opencontainers/runc into its
own package.  This patch moves to using the new selinux go bindings.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-03-22 13:58:35 -04:00
parent c12db22819
commit 19620f3d1e
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/sandbox_remove.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/kubernetes-incubator/cri-o/oci"
"github.com/opencontainers/runc/libcontainer/label"
"github.com/opencontainers/selinux/go-selinux/label"
"golang.org/x/net/context"
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
)
@ -66,7 +66,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
}
}
if err := label.UnreserveLabel(sb.processLabel); err != nil {
if err := label.ReleaseLabel(sb.processLabel); err != nil {
return nil, err
}