diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-01 15:32:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 15:32:14 -0400 |
| commit | 1de96f2c4c390bae29c303e2390da9e87a993d3f (patch) | |
| tree | b9a2839581ca47bc7cbac93eabb248144d073848 /pkg/domain | |
| parent | 9dddd6ab4bd8d5d142ffc53732668212da34b0e6 (diff) | |
| parent | 6da97c86314d8c80b912ba83db57fd26da19bfb7 (diff) | |
| download | podman-1de96f2c4c390bae29c303e2390da9e87a993d3f.tar.gz podman-1de96f2c4c390bae29c303e2390da9e87a993d3f.tar.bz2 podman-1de96f2c4c390bae29c303e2390da9e87a993d3f.zip | |
Merge pull request #11777 from cdoern/podVolumesFrom
Pod Volumes From Support
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/pods.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 0356383ec..653f64b42 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -135,6 +135,7 @@ type PodCreateOptions struct { CpusetCpus string `json:"cpuset_cpus,omitempty"` Userns specgen.Namespace `json:"-"` Volume []string `json:"volume,omitempty"` + VolumesFrom []string `json:"volumes_from,omitempty"` } // PodLogsOptions describes the options to extract pod logs. @@ -251,7 +252,7 @@ type ContainerCreateOptions struct { UTS string Mount []string Volume []string `json:"volume,omitempty"` - VolumesFrom []string + VolumesFrom []string `json:"volumes_from,omitempty"` Workdir string SeccompPolicy string PidFile string @@ -308,6 +309,7 @@ func ToPodSpecGen(s specgen.PodSpecGenerator, p *PodCreateOptions) (*specgen.Pod s.InfraImage = p.InfraImage s.SharedNamespaces = p.Share s.PodCreateCommand = p.CreateCommand + s.VolumesFrom = p.VolumesFrom // Networking config |