Skip to content

K
k3s
Commit a8fecd0c authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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
parents cdf60ee7 a573a0ed
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pkg/kubelet/kubelet.go
View file @ a8fecd0c
...@@ -1422,7 +1422,8 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Cont ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment