scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-26 19:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

add v1 tests to hack/test-go; let default value of Container.SecurityContext to be nil

Browse Source
This commit is contained in:
Chao Xu
2015-06-01 21:51:26 -07:00
parent 9740c7c3ad
commit d52cef11a4
11 changed files with 165 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/v1beta3/defaults.go
View File

@@ -171,6 +171,9 @@ func defaultHostNetworkPorts(containers *[]Container) {
// defaultSecurityContext performs the downward and upward merges of a pod definition
func defaultSecurityContext(container *Container) {
if container.SecurityContext == nil {
if (len(container.Capabilities.Add) == 0) && (len(container.Capabilities.Drop) == 0) && (container.Privileged == false) {
return
}
glog.V(5).Infof("creating security context for container %s", container.Name)
container.SecurityContext = &SecurityContext{}
}