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

Remove pod mutation for volumes annotated with supplemental groups

Browse Source
This commit is contained in:
Paul Morie
2016-06-17 15:36:56 -04:00
parent 7edb84c2eb
commit a573a0eda3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@@ -1414,7 +1414,8 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Cont
return nil, err return nil, err
} }
opts.Hostname = hostname opts.Hostname = hostname
volumes := kl.volumeManager.GetVolumesForPodAndAppendSupplementalGroups(pod) podName := volumehelper.GetUniquePodName(pod)
volumes := kl.volumeManager.GetMountedVolumesForPod(podName)
opts.PortMappings = makePortMappings(container) opts.PortMappings = makePortMappings(container)
// Docker does not relabel volumes if the container is running // Docker does not relabel volumes if the container is running