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

Merge pull request #27639 from pmorie/goodbye-pod-mutation
a8fecd0c · k8s-merge-robot · GitHub · cdf60ee7 · a573a0ed · a8fecd0c
Commit a8fecd0c authored Jun 21, 2016 by k8s-merge-robot Committed by GitHub Jun 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

kubelet.go pkg/kubelet/kubelet.go +2 -1

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1422,7 +1422,8 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Cont
 		return nil, err
 	}
 	opts.Hostname = hostname
-	volumes := kl.volumeManager.GetVolumesForPodAndAppendSupplementalGroups(pod)
+	podName := volumehelper.GetUniquePodName(pod)
+	volumes := kl.volumeManager.GetMountedVolumesForPod(podName)

 	opts.PortMappings = makePortMappings(container)
 	// Docker does not relabel volumes if the container is running