diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7779bd47bb..bd101a86e3 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -140,79 +140,79 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", @@ -220,27 +220,27 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "924968a49b2f4a9ce38f8780eb120571d6b8dad3" + "Rev": "d6393f5b67481435fa88c16cb8217658e0665407" } ] } diff --git a/extensions/v1beta1/generated.proto b/extensions/v1beta1/generated.proto index c5414616ae..f6898bce64 100644 --- a/extensions/v1beta1/generated.proto +++ b/extensions/v1beta1/generated.proto @@ -772,8 +772,9 @@ message PodSecurityPolicySpec { optional bool privileged = 1; // 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 - // DefaultAddCapabilities and RequiredDropCapabilities. + // unless the pod spec specifically drops the capability. You may not list a capability in both + // DefaultAddCapabilities and RequiredDropCapabilities. Capabilities added here are implicitly + // allowed, and need not be included in the AllowedCapabilities list. // +optional repeated string defaultAddCapabilities = 2; diff --git a/extensions/v1beta1/types.go b/extensions/v1beta1/types.go index 6e666b205b..d4ca1832ca 100644 --- a/extensions/v1beta1/types.go +++ b/extensions/v1beta1/types.go @@ -882,8 +882,9 @@ type PodSecurityPolicySpec struct { // +optional 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 - // unless the pod spec specifically drops the capability. You may not list a capabiility in both - // DefaultAddCapabilities and RequiredDropCapabilities. + // unless the pod spec specifically drops the capability. You may not list a capability in both + // DefaultAddCapabilities and RequiredDropCapabilities. Capabilities added here are implicitly + // allowed, and need not be included in the AllowedCapabilities list. // +optional 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 diff --git a/extensions/v1beta1/types_swagger_doc_generated.go b/extensions/v1beta1/types_swagger_doc_generated.go index 20f529d871..b98d117952 100644 --- a/extensions/v1beta1/types_swagger_doc_generated.go +++ b/extensions/v1beta1/types_swagger_doc_generated.go @@ -449,7 +449,7 @@ func (PodSecurityPolicyList) SwaggerDoc() map[string]string { var map_PodSecurityPolicySpec = map[string]string{ "": "Pod Security Policy Spec defines the policy enforced.", "privileged": "privileged determines if a pod can request to be run as privileged.", - "defaultAddCapabilities": "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 DefaultAddCapabilities and RequiredDropCapabilities.", + "defaultAddCapabilities": "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 DefaultAddCapabilities and RequiredDropCapabilities. Capabilities added here are implicitly allowed, and need not be included in the AllowedCapabilities list.", "requiredDropCapabilities": "RequiredDropCapabilities are the capabilities that will be dropped from the container. These are required to be dropped and cannot be added.", "allowedCapabilities": "AllowedCapabilities is a list of capabilities that can be requested to add to the container. Capabilities in this field may be added at the pod author's discretion. You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities.", "volumes": "volumes is a white list of allowed volume plugins. Empty indicates that all plugins may be used.",