summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-27 13:11:31 +0200
committerGitHub <noreply@github.com>2022-03-27 13:11:31 +0200
commitddfa087d002a7acf1fb34388e8cec17a2c9efae6 (patch)
treeea8595903bf31e7f6b6e1f02a76e63c2f51c8fec /pkg/specgen/generate
parent28504f5dd4f37fd9b049c0081a1b0619a191f4de (diff)
parent7680211edefc32d97c6ec82062afa7a1ea00a001 (diff)
downloadpodman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.tar.gz
podman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.tar.bz2
podman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.zip
Merge pull request #13660 from rhatdan/error
Remove error stutter
Diffstat (limited to 'pkg/specgen/generate')
-rw-r--r--pkg/specgen/generate/kube/volume.go2
-rw-r--r--pkg/specgen/generate/storage.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go
index d57cb5685..987f11569 100644
--- a/pkg/specgen/generate/kube/volume.go
+++ b/pkg/specgen/generate/kube/volume.go
@@ -76,7 +76,7 @@ func VolumeFromHostPath(hostPath *v1.HostPathVolumeSource) (*KubeVolume, error)
return nil, errors.Wrap(err, "error checking HostPathSocket")
}
if st.Mode()&os.ModeSocket != os.ModeSocket {
- return nil, errors.Errorf("error checking HostPathSocket: path %s is not a socket", hostPath.Path)
+ return nil, errors.Errorf("checking HostPathSocket: path %s is not a socket", hostPath.Path)
}
case v1.HostPathDirectory:
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go
index 6dcc1b7bf..f30fc4671 100644
--- a/pkg/specgen/generate/storage.go
+++ b/pkg/specgen/generate/storage.go
@@ -292,7 +292,7 @@ func getVolumesFrom(volumesFrom []string, runtime *libpod.Runtime) (map[string]s
// and append them in if we can find them.
spec := ctr.Spec()
if spec == nil {
- return nil, nil, errors.Errorf("error retrieving container %s spec for volumes-from", ctr.ID())
+ return nil, nil, errors.Errorf("retrieving container %s spec for volumes-from", ctr.ID())
}
for _, mnt := range spec.Mounts {
if mnt.Type != define.TypeBind {