summaryrefslogtreecommitdiff
path: root/pkg/adapter
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-06-28 14:46:38 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-08-01 03:48:16 -0400
commite7aca5568a057b99c6ca495a912dfd66b901fdcc (patch)
treea7fbe9c3db1af53b44b4b6af3b36691baa808b02 /pkg/adapter
parent39de184b8bfb14954f77190f0e6127c1ddc363c0 (diff)
downloadpodman-e7aca5568a057b99c6ca495a912dfd66b901fdcc.tar.gz
podman-e7aca5568a057b99c6ca495a912dfd66b901fdcc.tar.bz2
podman-e7aca5568a057b99c6ca495a912dfd66b901fdcc.zip
Use buildah/pkg/parse volume parsing rather then internal version
We share this code with buildah, so we should eliminate the podman version. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/adapter')
-rw-r--r--pkg/adapter/pods.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go
index b9d7fcd9b..2a52cfd0c 100644
--- a/pkg/adapter/pods.go
+++ b/pkg/adapter/pods.go
@@ -10,6 +10,7 @@ import (
"os"
"strings"
+ "github.com/containers/buildah/pkg/parse"
"github.com/containers/image/types"
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/cmd/podman/shared"
@@ -570,7 +571,7 @@ func (r *LocalRuntime) PlayKubeYAML(ctx context.Context, c *cliconfig.KubePlayVa
}
}
- if err := createconfig.ValidateVolumeHostDir(hostPath.Path); err != nil {
+ if err := parse.ValidateVolumeHostDir(hostPath.Path); err != nil {
return nil, errors.Wrapf(err, "Error in parsing HostPath in YAML")
}
volumes[volume.Name] = hostPath.Path
@@ -728,7 +729,7 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container
if !exists {
return nil, errors.Errorf("Volume mount %s specified for container but not configured in volumes", volume.Name)
}
- if err := createconfig.ValidateVolumeCtrDir(volume.MountPath); err != nil {
+ if err := parse.ValidateVolumeCtrDir(volume.MountPath); err != nil {
return nil, errors.Wrapf(err, "error in parsing MountPath")
}
containerConfig.Volumes = append(containerConfig.Volumes, fmt.Sprintf("%s:%s", hostPath, volume.MountPath))