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

Merge pull request #10992 from rhatdan/play

Browse Source 
Fix handling of selinux labels in podman play kube
This commit is contained in:
OpenShift Merge Robot
2021-07-21 12:42:32 -04:00
committed by GitHub
parent 782634334e 117850e6eb
commit e3816ddb11
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,10 +276,11 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
return nil, err return nil, err
} }
volume.MountPath = dest
switch volumeSource.Type { switch volumeSource.Type {
case KubeVolumeTypeBindMount: case KubeVolumeTypeBindMount:
mount := spec.Mount{ mount := spec.Mount{
Destination: dest, Destination: volume.MountPath,
Source: volumeSource.Source, Source: volumeSource.Source,
Type: "bind", Type: "bind",
Options: options, Options: options,
@ -287,7 +288,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
s.Mounts = append(s.Mounts, mount) s.Mounts = append(s.Mounts, mount)
case KubeVolumeTypeNamed: case KubeVolumeTypeNamed:
namedVolume := specgen.NamedVolume{ namedVolume := specgen.NamedVolume{
Dest: dest, Dest: volume.MountPath,
Name: volumeSource.Source, Name: volumeSource.Source,
Options: options, Options: options,
} }
@ -330,12 +331,16 @@ func parseMountPath(mountPath string, readOnly bool) (string, []string, error) {
options = strings.Split(splitVol[1], ",") options = strings.Split(splitVol[1], ",")
} }
if err := parse.ValidateVolumeCtrDir(dest); err != nil { if err := parse.ValidateVolumeCtrDir(dest); err != nil {
return "", options, errors.Wrapf(err, "error in parsing MountPath") return "", options, errors.Wrapf(err, "parsing MountPath")
} }
if readOnly { if readOnly {
options = append(options, "ro") options = append(options, "ro")
} }
return dest, options, nil opts, err := parse.ValidateVolumeOpts(options)
if err != nil {
return "", opts, errors.Wrapf(err, "parsing MountOptions")
}
return dest, opts, nil
} }
func setupLivenessProbe(s *specgen.SpecGenerator, containerYAML v1.Container, restartPolicy string) error { func setupLivenessProbe(s *specgen.SpecGenerator, containerYAML v1.Container, restartPolicy string) error {