Merge pull request #18820 from runcom/fix-pod-sandbox-privilege

Automatic merge from submit-queue. UPSTREAM: 58977: Fix pod sandbox privilege. Aim to fix the selinux issue we're seeing between cri-o and docker on builds /cc @bparees @smarterclayton @mrunalp @rhatdan @derekwaynecarr Signed-off-by: Antonio Murdaca <[email protected]>
openshift · Mar 7, 2018 · d1947e4 · d1947e4
2 parents 254fcac + b3e0ad5
commit d1947e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/container/helpers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/container/helpers.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/container/helpers_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/container/helpers_test.go