summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-19 15:49:11 -0400
committerGitHub <noreply@github.com>2020-10-19 15:49:11 -0400
commite944544271d9e515bdfc7e364e3ddf372b0dd378 (patch)
treef1db817702a42e6c1d910033bcfa85024fc9417e
parent7ffcab0854342844a44b2668bd9d98849bf935c8 (diff)
parent8cbf7700a557b9f0a58664c8b0f400b30fae5709 (diff)
downloadpodman-e944544271d9e515bdfc7e364e3ddf372b0dd378.tar.gz
podman-e944544271d9e515bdfc7e364e3ddf372b0dd378.tar.bz2
podman-e944544271d9e515bdfc7e364e3ddf372b0dd378.zip
Merge pull request #8056 from xordspar0/invalid-image
Make invalid image name error more specific
-rw-r--r--pkg/domain/infra/abi/play.go2
-rw-r--r--test/e2e/play_kube_test.go19
2 files changed, 20 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index a7c66bae6..348570a20 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -341,7 +341,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
}
named, err := reference.ParseNormalizedNamed(container.Image)
if err != nil {
- return nil, err
+ return nil, errors.Wrapf(err, "Failed to parse image %q", container.Image)
}
// In kube, if the image is tagged with latest, it should always pull
if tagged, isTagged := named.(reference.NamedTagged); isTagged {
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 3906fa49d..7ab8dc6f8 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -1447,4 +1447,23 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`})
Expect(inspect.OutputToString()).To(ContainSubstring("Memory: " + expectedMemoryLimit))
}
})
+
+ It("podman play kube reports invalid image name", func() {
+ invalidImageName := "./myimage"
+
+ pod := getPod(
+ withCtr(
+ getCtr(
+ withImage(invalidImageName),
+ ),
+ ),
+ )
+ err := generateKubeYaml("pod", pod, kubeYaml)
+ Expect(err).To(BeNil())
+
+ kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+ kube.WaitWithDefaultTimeout()
+ Expect(kube.ExitCode()).To(Equal(125))
+ Expect(kube.ErrorToString()).To(ContainSubstring(invalidImageName))
+ })
})