github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37135 from feiskyer/seccomp2 

Automatic merge from submit-queue

CRI: address knows issues of seccomp

For https://github.com/kubernetes/kubernetes/issues/36997.

To move forward, we decided to list seccomp profile path problem as a know issue in CRI (see [here](https://github.com/kubernetes/kubernetes/issues/36997#issuecomment-261673120)).

cc/ @yujuhong @euank @kubernetes/sig-node
pull/6/head
Kubernetes Submit Queue 2016-11-18 20:45:12 -08:00 committed by GitHub
parent fa0eb19bcc 8322e5091e
commit 1de096bd52
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/api/v1alpha1/runtime/api.pb.go
View File

@ -665,7 +665,8 @@ type PodSandboxConfig struct {
// * runtime/default: the default profile for the container runtime
// * unconfined: unconfined profile, ie, no seccomp sandboxing
// * localhost/<profile-name>: the profile installed to the node's
// local seccomp profile root
// local seccomp profile root. Note that profile root is set in
// kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997.
//
// 3. Sysctls
//

3
pkg/kubelet/api/v1alpha1/runtime/api.proto
View File

@ -255,7 +255,8 @@ message PodSandboxConfig {
// * runtime/default: the default profile for the container runtime
// * unconfined: unconfined profile, ie, no seccomp sandboxing
// * localhost/<profile-name>: the profile installed to the node's
// local seccomp profile root
// local seccomp profile root. Note that profile root is set in
// kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997.
//
// 3. Sysctls
//