Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
31ac1d8e
Commit
31ac1d8e
authored
Jul 17, 2017
by
Pengfei Ni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move seccomp from anntations to security context
parent
396d8b11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
21 deletions
+7
-21
api.proto
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto
+7
-21
No files found.
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto
View file @
31ac1d8e
...
@@ -272,32 +272,12 @@ message PodSandboxConfig {
...
@@ -272,32 +272,12 @@ message PodSandboxConfig {
//
//
// In general, in order to preserve a well-defined interface between the
// In general, in order to preserve a well-defined interface between the
// kubelet and the container runtime, annotations SHOULD NOT influence
// kubelet and the container runtime, annotations SHOULD NOT influence
// runtime behaviour. For legacy reasons, there are some annotations which
// runtime behaviour.
// currently explicitly break this rule, listed below; in future versions
// of the interface these will be promoted to typed features.
//
//
// Annotations can also be useful for runtime authors to experiment with
// Annotations can also be useful for runtime authors to experiment with
// new features that are opaque to the Kubernetes APIs (both user-facing
// new features that are opaque to the Kubernetes APIs (both user-facing
// and the CRI). Whenever possible, however, runtime authors SHOULD
// and the CRI). Whenever possible, however, runtime authors SHOULD
// consider proposing new typed fields for any new features instead.
// consider proposing new typed fields for any new features instead.
//
// 1. Seccomp
//
// key: security.alpha.kubernetes.io/seccomp/pod
// description: the seccomp profile for the containers of an entire pod.
// value: see below.
//
// key: security.alpha.kubernetes.io/seccomp/container/<container name>
// description: the seccomp profile for the container (overrides pod).
// value: see below
//
// The value of seccomp is runtime agnostic:
// * 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. Note that profile root is set in
// kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997.
//
map
<
string
,
string
>
annotations
=
7
;
map
<
string
,
string
>
annotations
=
7
;
// Optional configurations specific to Linux hosts.
// Optional configurations specific to Linux hosts.
LinuxPodSandboxConfig
linux
=
8
;
LinuxPodSandboxConfig
linux
=
8
;
...
@@ -522,6 +502,12 @@ message LinuxContainerSecurityContext {
...
@@ -522,6 +502,12 @@ message LinuxContainerSecurityContext {
// (localhost) by name. The possible profile names are detailed at
// (localhost) by name. The possible profile names are detailed at
// http://wiki.apparmor.net/index.php/AppArmor_Core_Policy_Reference
// http://wiki.apparmor.net/index.php/AppArmor_Core_Policy_Reference
string
apparmor_profile
=
9
;
string
apparmor_profile
=
9
;
// Seccomp profile for the container, candidate values are:
// * runtime/default: the default profile for the container runtime
// * unconfined: unconfined profile, ie, no seccomp sandboxing
// * localhost/<full-path-to-profile>: the profile installed on the node.
// <full-path-to-profile> is the full path of the profile.
string
seccomp_profile_path
=
10
;
}
}
// LinuxContainerConfig contains platform-specific configuration for
// LinuxContainerConfig contains platform-specific configuration for
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment