opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-29 01:35:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13320 from giuseppe/play-kube-honor-propagation-mode

Browse Source 
kube: honor mount propagation mode
This commit is contained in:
OpenShift Merge Robot
2022-02-23 09:25:07 -05:00
committed by GitHub
parent 8b2432422f ed73040b35
commit cbca58e8d7
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/specgen/generate/kube/kube.go
View File

@ -322,7 +322,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
continue
}
dest, options, err := parseMountPath(volume.MountPath, volume.ReadOnly)
dest, options, err := parseMountPath(volume.MountPath, volume.ReadOnly, volume.MountPropagation)
if err != nil {
return nil, err
}
@ -388,7 +388,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
return s, nil
}
func parseMountPath(mountPath string, readOnly bool) (string, []string, error) {
func parseMountPath(mountPath string, readOnly bool, propagationMode *v1.MountPropagationMode) (string, []string, error) {
options := []string{}
splitVol := strings.Split(mountPath, ":")
if len(splitVol) > 2 {
@ -408,6 +408,18 @@ func parseMountPath(mountPath string, readOnly bool) (string, []string, error) {
if err != nil {
return "", opts, errors.Wrapf(err, "parsing MountOptions")
}
if propagationMode != nil {
switch *propagationMode {
case v1.MountPropagationNone:
opts = append(opts, "private")
case v1.MountPropagationHostToContainer:
opts = append(opts, "rslave")
case v1.MountPropagationBidirectional:
opts = append(opts, "rshared")
default:
return "", opts, errors.Errorf("unknown propagation mode %q", *propagationMode)
}
}
return dest, opts, nil
}

42
pkg/specgen/generate/kube/kube_test.go Normal file
View File

@ -0,0 +1,42 @@
package kube
import (
"testing"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
//"github.com/stretchr/testify/require"
)
func testPropagation(t *testing.T, propagation v1.MountPropagationMode, expected string) {
dest, options, err := parseMountPath("/to", false, &propagation)
assert.NoError(t, err)
assert.Equal(t, dest, "/to")
assert.Contains(t, options, expected)
}
func TestParseMountPathPropagation(t *testing.T) {
testPropagation(t, v1.MountPropagationNone, "private")
testPropagation(t, v1.MountPropagationHostToContainer, "rslave")
testPropagation(t, v1.MountPropagationBidirectional, "rshared")
prop := v1.MountPropagationMode("SpaceWave")
_, _, err := parseMountPath("/to", false, &prop)
assert.Error(t, err)
_, options, err := parseMountPath("/to", false, nil)
assert.NoError(t, err)
assert.NotContains(t, options, "private")
assert.NotContains(t, options, "rslave")
assert.NotContains(t, options, "rshared")
}
func TestParseMountPathRO(t *testing.T) {
_, options, err := parseMountPath("/to", true, nil)
assert.NoError(t, err)
assert.Contains(t, options, "ro")
_, options, err = parseMountPath("/to", false, nil)
assert.NoError(t, err)
assert.NotContains(t, options, "ro")
}