github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27639 from pmorie/goodbye-pod-mutation 

Automatic merge from submit-queue

Remove pod mutation for volumes annotated with supplemental groups

Removes the pod mutation added in #20490 -- partially resolves #27197 from the standpoint of making the feature inactive in 1.3.  Our plan is to make this work correctly in 1.4.

@kubernetes/sig-storage
pull/6/head
k8s-merge-robot 2016-06-21 03:18:45 -07:00 committed by GitHub
parent cdf60ee760 a573a0eda3
commit a8fecd0cc6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -1422,7 +1422,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