diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-01 09:51:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 09:51:23 -0400 |
| commit | 23e57575b0a402d7f7de9d20571776d0512fd489 (patch) | |
| tree | 15e4759aa0305b4cecd9d20eeeaafbc5955eb9cf /pkg/specgenutil | |
| parent | 59fcf0e39d91e00d8385ffda3a09c32a1464c117 (diff) | |
| parent | 7a5342804944472246ed0b977e9088e0b01be87b (diff) | |
| download | podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.gz podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.bz2 podman-23e57575b0a402d7f7de9d20571776d0512fd489.zip | |
Merge pull request #13594 from cdoern/podVolumes
fix pod volume passing and alter infra inheritance
Diffstat (limited to 'pkg/specgenutil')
| -rw-r--r-- | pkg/specgenutil/volumes.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 2bd79b186..dd7eed2fd 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -28,7 +28,7 @@ var ( // TODO: handle options parsing/processing via containers/storage/pkg/mount func parseVolumes(volumeFlag, mountFlag, tmpfsFlag []string, addReadOnlyTmpfs bool) ([]spec.Mount, []*specgen.NamedVolume, []*specgen.OverlayVolume, []*specgen.ImageVolume, error) { // Get mounts from the --mounts flag. - unifiedMounts, unifiedVolumes, unifiedImageVolumes, err := getMounts(mountFlag) + unifiedMounts, unifiedVolumes, unifiedImageVolumes, err := Mounts(mountFlag) if err != nil { return nil, nil, nil, nil, err } @@ -167,12 +167,12 @@ func findMountType(input string) (mountType string, tokens []string, err error) return } -// getMounts takes user-provided input from the --mount flag and creates OCI +// Mounts takes user-provided input from the --mount flag and creates OCI // spec mounts and Libpod named volumes. // podman run --mount type=bind,src=/etc/resolv.conf,target=/etc/resolv.conf ... // podman run --mount type=tmpfs,target=/dev/shm ... // podman run --mount type=volume,source=test-volume, ... -func getMounts(mountFlag []string) (map[string]spec.Mount, map[string]*specgen.NamedVolume, map[string]*specgen.ImageVolume, error) { +func Mounts(mountFlag []string) (map[string]spec.Mount, map[string]*specgen.NamedVolume, map[string]*specgen.ImageVolume, error) { finalMounts := make(map[string]spec.Mount) finalNamedVolumes := make(map[string]*specgen.NamedVolume) finalImageVolumes := make(map[string]*specgen.ImageVolume) |