github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename CapabilityType Capability

Browse Source
This commit is contained in:
Tim Hockin
2015-05-18 13:37:10 -07:00
parent fd22f48f5b
commit 65833e42c4
21 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/v1beta1/conversion_test.go
View File

@@ -771,11 +771,11 @@ func TestBadSecurityContextConversion(t *testing.T) {
"mismatched caps add": {
c: &current.Container{
Capabilities: current.Capabilities{
Add: []current.CapabilityType{"foo"},
Add: []current.Capability{"foo"},
},
SecurityContext: &current.SecurityContext{
Capabilities: &current.Capabilities{
Add: []current.CapabilityType{"bar"},
Add: []current.Capability{"bar"},
},
},
},
@@ -784,11 +784,11 @@ func TestBadSecurityContextConversion(t *testing.T) {
"mismatched caps drop": {
c: &current.Container{
Capabilities: current.Capabilities{
Drop: []current.CapabilityType{"foo"},
Drop: []current.Capability{"foo"},
},
SecurityContext: &current.SecurityContext{
Capabilities: &current.Capabilities{
Drop: []current.CapabilityType{"bar"},
Drop: []current.Capability{"bar"},
},
},
},

24
pkg/api/v1beta1/defaults_test.go
View File

@@ -351,8 +351,8 @@ func TestSetDefaultSecurityContext(t *testing.T) {
c: current.Container{
Privileged: false,
Capabilities: current.Capabilities{
Add: []current.CapabilityType{"foo"},
Drop: []current.CapabilityType{"bar"},
Add: []current.Capability{"foo"},
Drop: []current.Capability{"bar"},
},
SecurityContext: &current.SecurityContext{
Privileged: &priv,
@@ -363,13 +363,13 @@ func TestSetDefaultSecurityContext(t *testing.T) {
c: current.Container{
Privileged: false,
Capabilities: current.Capabilities{
Add: []current.CapabilityType{"foo"},
Drop: []current.CapabilityType{"bar"},
Add: []current.Capability{"foo"},
Drop: []current.Capability{"bar"},
},
SecurityContext: &current.SecurityContext{
Capabilities: &current.Capabilities{
Add: []current.CapabilityType{"foo"},
Drop: []current.CapabilityType{"bar"},
Add: []current.Capability{"foo"},
Drop: []current.Capability{"bar"},
},
},
},
@@ -380,8 +380,8 @@ func TestSetDefaultSecurityContext(t *testing.T) {
SecurityContext: &current.SecurityContext{
Privileged: &priv,
Capabilities: &current.Capabilities{
Add: []current.CapabilityType{"biz"},
Drop: []current.CapabilityType{"baz"},
Add: []current.Capability{"biz"},
Drop: []current.Capability{"baz"},
},
},
},
@@ -389,14 +389,14 @@ func TestSetDefaultSecurityContext(t *testing.T) {
"upward defaulting priv": {
c: current.Container{
Capabilities: current.Capabilities{
Add: []current.CapabilityType{"foo"},
Drop: []current.CapabilityType{"bar"},
Add: []current.Capability{"foo"},
Drop: []current.Capability{"bar"},
},
SecurityContext: &current.SecurityContext{
Privileged: &privTrue,
Capabilities: &current.Capabilities{
Add: []current.CapabilityType{"foo"},
Drop: []current.CapabilityType{"bar"},
Add: []current.Capability{"foo"},
Drop: []current.Capability{"bar"},
},
},
},

8
pkg/api/v1beta1/types.go
View File

@@ -481,15 +481,15 @@ const (
PullIfNotPresent PullPolicy = "PullIfNotPresent"
)
// CapabilityType represent POSIX capabilities type
type CapabilityType string
// Capability represent POSIX capabilities type
type Capability string
// Capabilities represent POSIX capabilities that can be added or removed to a running container.
type Capabilities struct {
// Added capabilities
Add []CapabilityType `json:"add,omitempty" description:"added capabilities"`
Add []Capability `json:"add,omitempty" description:"added capabilities"`
// Removed capabilities
Drop []CapabilityType `json:"drop,omitempty" description:"droped capabilities"`
Drop []Capability `json:"drop,omitempty" description:"droped capabilities"`
}
type ResourceRequirements struct {