diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-09 14:23:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 14:23:15 -0500 |
| commit | 995a60481a873d15579739cf6f04547e3cb61a3e (patch) | |
| tree | 8fb6593ef99145ff6cf8b14a110f4bd6a9a6b87e /libpod | |
| parent | 763d522983b819ecd38689c9c0840069d1e2b530 (diff) | |
| parent | 48c612cf6671c918e8f11e836de8c6172bd73663 (diff) | |
| download | podman-995a60481a873d15579739cf6f04547e3cb61a3e.tar.gz podman-995a60481a873d15579739cf6f04547e3cb61a3e.tar.bz2 podman-995a60481a873d15579739cf6f04547e3cb61a3e.zip | |
Merge pull request #9283 from vrothberg/fix-8897
generate kube: do not set caps with --privileged
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/kube.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index f9ead027d..6cb7723c9 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -322,7 +322,8 @@ func containerToV1Container(c *Container) (v1.Container, []v1.Volume, *v1.PodDNS return kubeContainer, kubeVolumes, nil, err } - if len(c.config.Spec.Linux.Devices) > 0 { + // NOTE: a privileged container mounts all of /dev/*. + if !c.Privileged() && len(c.config.Spec.Linux.Devices) > 0 { // TODO Enable when we can support devices and their names kubeContainer.VolumeDevices = generateKubeVolumeDeviceFromLinuxDevice(c.Spec().Linux.Devices) return kubeContainer, kubeVolumes, nil, errors.Wrapf(define.ErrNotImplemented, "linux devices") @@ -625,13 +626,18 @@ func capAddDrop(caps *specs.LinuxCapabilities) (*v1.Capabilities, error) { // generateKubeSecurityContext generates a securityContext based on the existing container func generateKubeSecurityContext(c *Container) (*v1.SecurityContext, error) { - priv := c.Privileged() + privileged := c.Privileged() ro := c.IsReadOnly() allowPrivEscalation := !c.config.Spec.Process.NoNewPrivileges - newCaps, err := capAddDrop(c.config.Spec.Process.Capabilities) - if err != nil { - return nil, err + var capabilities *v1.Capabilities + if !privileged { + // Running privileged adds all caps. + newCaps, err := capAddDrop(c.config.Spec.Process.Capabilities) + if err != nil { + return nil, err + } + capabilities = newCaps } var selinuxOpts v1.SELinuxOptions @@ -651,8 +657,8 @@ func generateKubeSecurityContext(c *Container) (*v1.SecurityContext, error) { } sc := v1.SecurityContext{ - Capabilities: newCaps, - Privileged: &priv, + Capabilities: capabilities, + Privileged: &privileged, SELinuxOptions: &selinuxOpts, // RunAsNonRoot is an optional parameter; our first implementations should be root only; however // I'm leaving this as a bread-crumb for later |