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
72196b9a
Unverified
Commit
72196b9a
authored
Oct 13, 2017
by
Tim Allclair
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify DefaultAddCapabilities behavior
parent
454074d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
types.go
pkg/apis/extensions/types.go
+2
-1
types.go
staging/src/k8s.io/api/extensions/v1beta1/types.go
+3
-2
No files found.
pkg/apis/extensions/types.go
View file @
72196b9a
...
@@ -821,7 +821,8 @@ type PodSecurityPolicySpec struct {
...
@@ -821,7 +821,8 @@ type PodSecurityPolicySpec struct {
Privileged
bool
Privileged
bool
// DefaultAddCapabilities is the default set of capabilities that will be added to the container
// DefaultAddCapabilities is the default set of capabilities that will be added to the container
// unless the pod spec specifically drops the capability. You may not list a capability in both
// unless the pod spec specifically drops the capability. You may not list a capability in both
// DefaultAddCapabilities and RequiredDropCapabilities.
// DefaultAddCapabilities and RequiredDropCapabilities. Capabilities added here are implicitly
// allowed, and need not be included in the AllowedCapabilities list.
// +optional
// +optional
DefaultAddCapabilities
[]
api
.
Capability
DefaultAddCapabilities
[]
api
.
Capability
// RequiredDropCapabilities are the capabilities that will be dropped from the container. These
// RequiredDropCapabilities are the capabilities that will be dropped from the container. These
...
...
staging/src/k8s.io/api/extensions/v1beta1/types.go
View file @
72196b9a
...
@@ -855,8 +855,9 @@ type PodSecurityPolicySpec struct {
...
@@ -855,8 +855,9 @@ type PodSecurityPolicySpec struct {
// +optional
// +optional
Privileged
bool
`json:"privileged,omitempty" protobuf:"varint,1,opt,name=privileged"`
Privileged
bool
`json:"privileged,omitempty" protobuf:"varint,1,opt,name=privileged"`
// DefaultAddCapabilities is the default set of capabilities that will be added to the container
// DefaultAddCapabilities is the default set of capabilities that will be added to the container
// unless the pod spec specifically drops the capability. You may not list a capabiility in both
// unless the pod spec specifically drops the capability. You may not list a capability in both
// DefaultAddCapabilities and RequiredDropCapabilities.
// DefaultAddCapabilities and RequiredDropCapabilities. Capabilities added here are implicitly
// allowed, and need not be included in the AllowedCapabilities list.
// +optional
// +optional
DefaultAddCapabilities
[]
v1
.
Capability
`json:"defaultAddCapabilities,omitempty" protobuf:"bytes,2,rep,name=defaultAddCapabilities,casttype=k8s.io/api/core/v1.Capability"`
DefaultAddCapabilities
[]
v1
.
Capability
`json:"defaultAddCapabilities,omitempty" protobuf:"bytes,2,rep,name=defaultAddCapabilities,casttype=k8s.io/api/core/v1.Capability"`
// RequiredDropCapabilities are the capabilities that will be dropped from the container. These
// RequiredDropCapabilities are the capabilities that will be dropped from the container. These
...
...
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