Merge pull request #17702 from openshift-cherrypick-robot/cherry-pick…

…-17512-to-release-3.8 Automated cherry-pick of #17512 on release-3.8
openshift · Dec 14, 2017 · 4eb2c77 · 4eb2c77
2 parents 4f0db51 + 2f75693
commit 4eb2c77
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/security_context.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/security_context.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/security_context_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/security_context_test.go