Merge pull request #15241 from pmorie/volume-proposal-fixup

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-08 09:09:15 -07:00
commit 036fe16849

View File

@ -272,7 +272,7 @@ type PodSecurityContext struct {
// FSGroup is a supplemental group that all containers in a pod run under. This group will own // FSGroup is a supplemental group that all containers in a pod run under. This group will own
// volumes that the Kubelet manages ownership for. If this is not specified, the Kubelet will // volumes that the Kubelet manages ownership for. If this is not specified, the Kubelet will
// not set the group ownership of any volumes. // not set the group ownership of any volumes.
FSGroup *int64 `json:"supplementalGroup"` FSGroup *int64 `json:"fsGroup,omitempty"`
} }
``` ```
@ -285,7 +285,7 @@ type PodSecurityContext struct {
// FSGroup is a supplemental group that all containers in a pod run under. This group will own // FSGroup is a supplemental group that all containers in a pod run under. This group will own
// volumes that the Kubelet manages ownership for. If this is not specified, the Kubelet will // volumes that the Kubelet manages ownership for. If this is not specified, the Kubelet will
// not set the group ownership of any volumes. // not set the group ownership of any volumes.
FSGroup *int64 `json:"supplementalGroup"` FSGroup *int64 `json:"fsGroup,omitempty"`
} }
``` ```
@ -455,7 +455,7 @@ metadata:
name: test-pod name: test-pod
spec: spec:
securityContext: securityContext:
supplementalGroup: 1001 fsGroup: 1001
containers: containers:
- name: a - name: a
securityContext: securityContext:
@ -487,7 +487,7 @@ metadata:
name: test-pod name: test-pod
spec: spec:
securityContext: securityContext:
supplementalGroup: 1001 fsGroup: 1001
containers: containers:
- name: a - name: a
securityContext: securityContext: