From 8ddef456796f9b8042417f0d3477999bc8781174 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Mon, 17 Aug 2015 11:23:11 -0400 Subject: [PATCH] Fix issue 10587; update SecurityContext godoc --- api/swagger-spec/v1.json | 2 +- pkg/api/v1/types.go | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 437d09cfa8f..2eca821f7c0 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -12777,7 +12777,7 @@ "properties": { "capabilities": { "$ref": "v1.Capabilities", - "description": "the linux capabilites that should be added or removed; see http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context" + "description": "the linux kernel capabilites that should be added or removed; see http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context" }, "privileged": { "type": "boolean", diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 40277537572..bdaf8c3a2f3 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -2011,17 +2011,12 @@ type ComponentStatusList struct { Items []ComponentStatus `json:"items" description:"list of component status objects"` } -// SecurityContext holds security configuration that will be applied to a container. SecurityContext -// contains duplication of some existing fields from the Container resource. These duplicate fields -// will be populated based on the Container configuration if they are not set. Defining them on -// both the Container AND the SecurityContext will result in an error. +// SecurityContext holds security configuration that will be applied to a container. type SecurityContext struct { // Capabilities are the capabilities to add/drop when running the container - // Must match Container.Capabilities or be unset. Will be defaulted to Container.Capabilities if left unset - Capabilities *Capabilities `json:"capabilities,omitempty" description:"the linux capabilites that should be added or removed; see http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"` + Capabilities *Capabilities `json:"capabilities,omitempty" description:"the linux kernel capabilites that should be added or removed; see http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"` // Run the container in privileged mode - // Must match Container.Privileged or be unset. Will be defaulted to Container.Privileged if left unset Privileged *bool `json:"privileged,omitempty" description:"run the container in privileged mode; see http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"` // SELinuxOptions are the labels to be applied to the container